ChangeLogTag:Fri Nov 7 21:09:01 UTC 2003 Don Hinton <dhinton@dresystems.com>

6 files changed, 685 insertions, 271 deletions

diff --git a/ace/Makefile.ace b/ace/Makefile.ace
index a9277ba1c95..a13be21b05c 100644
--- a/ace/Makefile.ace
+++ b/ace/Makefile.ace
@@ -23,6 +23,7 @@ OS_FILES = \
   Time_Value \
   Cleanup \
   Object_Manager_Base \
+  OS_main \
   OS_NS_arpa_inet \
   OS_NS_ctype \
   OS_NS_dirent \
@@ -934,6 +935,59 @@ endif # GHS
   os_include/os_fcntl.h \
   os_include/sys/os_stat.h
 
+.obj/OS_main.o .obj/OS_main.so .shobj/OS_main.o .shobj/OS_main.so: OS_main.cpp \
+  OS_main.h \
+  pre.h \
+  config-all.h \
+  config.h \
+  config-linux.h \
+  config-linux-common.h \
+  config-g++-common.h \
+  post.h \
+  ace_wchar.h \
+  ace_wchar.inl \
+  Object_Manager.h \
+  ACE_export.h \
+  Object_Manager_Base.h \
+  Cleanup.h \
+  os_include/sys/os_types.h \
+  os_include/os_stddef.h \
+  os_include/os_signal.h \
+  os_include/os_time.h \
+  os_include/os_ucontext.h \
+  Global_Macros.h \
+  OS_Errno.h \
+  os_include/os_errno.h \
+  Recursive_Thread_Mutex.h \
+  OS_NS_Thread.h \
+  Basic_Types.h \
+  os_include/os_limits.h \
+  os_include/os_unistd.h \
+  os_include/os_inttypes.h \
+  os_include/os_stdint.h \
+  os_include/os_stdio.h \
+  os_include/os_stdarg.h \
+  os_include/os_float.h \
+  os_include/os_stdlib.h \
+  os_include/sys/os_wait.h \
+  os_include/sys/os_resource.h \
+  os_include/sys/os_time.h \
+  Default_Constants.h \
+  os_include/os_pthread.h \
+  Base_Thread_Adapter.h \
+  OS_Log_Msg_Attributes.h \
+  iosfwd.h \
+  os_include/sys/os_sem.h \
+  os_include/sys/os_ipc.h \
+  os_include/os_semaphore.h \
+  OS_Memory.h \
+  OS_NS_stdlib.h \
+  OS_NS_signal.h \
+  Static_Object_Lock.h \
+  Managed_Object.h \
+  Managed_Object.cpp \
+  Managed_Object.i
+
 .obj/OS_NS_arpa_inet.o .obj/OS_NS_arpa_inet.so .shobj/OS_NS_arpa_inet.o .shobj/OS_NS_arpa_inet.so: OS_NS_arpa_inet.cpp \
   OS_NS_arpa_inet.h \
   pre.h \
@@ -1389,8 +1443,7 @@ endif # GHS
   OS_NS_wchar.h \
   os_include/os_wchar.h \
   os_include/os_string.h \
-  os_include/os_ctype.h \
-  OS_NS_stdlib.h
+  os_include/os_ctype.h
 
 .obj/OS_NS_strings.o .obj/OS_NS_strings.so .shobj/OS_NS_strings.o .shobj/OS_NS_strings.so: OS_NS_strings.cpp \
   OS_NS_strings.h \
@@ -1407,27 +1460,7 @@ endif # GHS
   os_include/os_strings.h \
   os_include/os_stddef.h \
   ACE_export.h \
-  OS_NS_strings.inl \
-  OS_NS_wchar.h \
-  os_include/os_wchar.h \
-  os_include/os_stdio.h \
-  os_include/os_stdarg.h \
-  os_include/os_stdlib.h \
-  os_include/sys/os_wait.h \
-  os_include/os_signal.h \
-  os_include/sys/os_types.h \
-  os_include/os_time.h \
-  os_include/os_ucontext.h \
-  os_include/sys/os_resource.h \
-  os_include/sys/os_time.h \
-  os_include/os_string.h \
-  os_include/os_ctype.h \
-  Basic_Types.h \
-  os_include/os_limits.h \
-  os_include/os_unistd.h \
-  os_include/os_inttypes.h \
-  os_include/os_stdint.h \
-  os_include/os_float.h
+  OS_NS_strings.inl
 
 .obj/OS_NS_stropts.o .obj/OS_NS_stropts.so .shobj/OS_NS_stropts.o .shobj/OS_NS_stropts.so: OS_NS_stropts.cpp \
   OS_NS_stropts.h \
@@ -1998,8 +2031,7 @@ endif # GHS
   os_include/os_stdint.h \
   os_include/os_float.h \
   ACE_export.h \
-  OS_NS_wchar.inl \
-  OS_NS_ctype.h
+  OS_NS_wchar.inl
 
 .obj/OS_QoS.o .obj/OS_QoS.so .shobj/OS_QoS.o .shobj/OS_QoS.so: OS_QoS.cpp \
   OS_QoS.h \
@@ -3094,7 +3126,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -3214,8 +3245,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -3668,10 +3697,6 @@ endif # GHS
   OS_Memory.h \
   OS_NS_stdlib.h \
   OS_NS_signal.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -3856,10 +3881,6 @@ endif # GHS
   OS_Memory.h \
   OS_NS_stdlib.h \
   OS_NS_signal.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -3908,6 +3929,9 @@ endif # GHS
   TSS_T.h \
   TSS_T.cpp \
   TSS_T.inl \
+  OS_NS_stdio.h \
+  os_include/os_fcntl.h \
+  os_include/sys/os_stat.h \
   Singleton.cpp \
   Singleton.i \
   Framework_Component.h \
@@ -4407,8 +4431,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -4473,10 +4495,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -4599,7 +4617,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -5435,8 +5452,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Cleanup.h \
-  OS_NS_stdio.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -6541,7 +6556,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -6649,7 +6663,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -6713,10 +6726,6 @@ endif # GHS
   OS_Memory.h \
   OS_NS_stdlib.h \
   OS_NS_signal.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.cpp \
   Managed_Object.i \
@@ -6757,6 +6766,9 @@ endif # GHS
   TSS_T.h \
   TSS_T.cpp \
   TSS_T.inl \
+  OS_NS_stdio.h \
+  os_include/os_fcntl.h \
+  os_include/sys/os_stat.h \
   Singleton.cpp \
   Singleton.i \
   Framework_Component.h \
@@ -6857,7 +6869,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -7036,7 +7047,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -7239,7 +7249,6 @@ endif # GHS
   Singleton.i \
   Object_Manager.h \
   Object_Manager_Base.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -7443,7 +7452,6 @@ endif # GHS
   Singleton.i \
   Object_Manager.h \
   Object_Manager_Base.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -7730,7 +7738,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -8739,7 +8746,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -8969,7 +8975,6 @@ endif # GHS
   Singleton.i \
   Object_Manager.h \
   Object_Manager_Base.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -9112,7 +9117,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -12256,10 +12260,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Cleanup.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -13433,7 +13433,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -13612,7 +13611,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -13789,7 +13787,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -13965,7 +13962,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -14179,7 +14175,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -14332,7 +14327,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -14478,7 +14472,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -14623,7 +14616,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -14759,7 +14751,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Cleanup.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -15596,8 +15587,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -15885,7 +15874,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16097,7 +16085,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16413,10 +16400,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16425,6 +16408,8 @@ endif # GHS
   Flag_Manip.h \
   Flag_Manip.i \
   OS_NS_fcntl.h \
+  os_include/os_fcntl.h \
+  os_include/sys/os_stat.h \
   Handle_Ops.h \
   Handle_Ops.i \
   Lib_Find.h \
@@ -16576,7 +16561,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16772,7 +16756,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16857,47 +16840,105 @@ endif # GHS
   ace_wchar.h \
   ace_wchar.inl \
   OS_main.h \
-  Object_Manager.h \
+  Cleanup.h \
   ACE_export.h \
   Object_Manager_Base.h \
-  Cleanup.h \
   os_include/sys/os_types.h \
   os_include/os_stddef.h \
   os_include/os_signal.h \
   os_include/os_time.h \
   os_include/os_ucontext.h \
-  Global_Macros.h \
-  OS_Errno.h \
-  os_include/os_errno.h \
-  Recursive_Thread_Mutex.h \
-  OS_NS_Thread.h \
-  Basic_Types.h \
-  os_include/os_limits.h \
-  os_include/os_unistd.h \
+  OS_NS_arpa_inet.h \
+  os_include/arpa/os_inet.h \
+  os_include/netinet/os_in.h \
   os_include/os_inttypes.h \
   os_include/os_stdint.h \
+  os_include/sys/os_socket.h \
+  os_include/sys/os_uio.h \
+  os_include/os_limits.h \
+  os_include/os_unistd.h \
   os_include/os_stdio.h \
   os_include/os_stdarg.h \
-  os_include/os_float.h \
+  OS_NS_ctype.h \
+  OS_NS_dirent.h \
+  os_include/os_dirent.h \
+  OS_NS_dlfcn.h \
+  os_include/os_dlfcn.h \
+  OS_NS_errno.h \
+  os_include/os_errno.h \
+  OS_NS_fcntl.h \
+  os_include/os_fcntl.h \
+  os_include/sys/os_stat.h \
+  Global_Macros.h \
+  OS_Errno.h \
+  OS_NS_math.h \
+  OS_NS_netdb.h \
+  os_include/os_netdb.h \
+  OS_NS_poll.h \
+  os_include/os_poll.h \
+  OS_NS_pwd.h \
+  os_include/os_pwd.h \
+  OS_NS_regex.h \
+  OS_NS_signal.h \
+  OS_NS_stdio.h \
+  OS_NS_stdlib.h \
   os_include/os_stdlib.h \
   os_include/sys/os_wait.h \
   os_include/sys/os_resource.h \
   os_include/sys/os_time.h \
+  OS_NS_string.h \
+  Basic_Types.h \
+  os_include/os_float.h \
+  OS_NS_strings.h \
+  os_include/os_strings.h \
+  OS_NS_stropts.h \
+  os_include/os_stropts.h \
+  OS_NS_sys_mman.h \
+  OS_NS_sys_msg.h \
+  os_include/sys/os_msg.h \
+  os_include/sys/os_ipc.h \
+  OS_NS_sys_resource.h \
+  OS_NS_sys_select.h \
+  os_include/sys/os_select.h \
+  OS_NS_sys_shm.h \
+  os_include/sys/os_shm.h \
+  OS_NS_sys_socket.h \
+  os_include/net/os_if.h \
+  OS_NS_sys_stat.h \
   Default_Constants.h \
+  OS_NS_sys_time.h \
+  Time_Value.h \
+  OS_NS_sys_uio.h \
+  OS_NS_sys_utsname.h \
+  os_include/sys/os_utsname.h \
+  OS_NS_sys_wait.h \
+  OS_NS_Thread.h \
   os_include/os_pthread.h \
   Base_Thread_Adapter.h \
   OS_Log_Msg_Attributes.h \
   iosfwd.h \
   os_include/sys/os_sem.h \
-  os_include/sys/os_ipc.h \
   os_include/os_semaphore.h \
   OS_Memory.h \
-  OS_NS_stdlib.h \
-  OS_NS_signal.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
+  OS_NS_time.h \
+  OS_NS_unistd.h \
+  OS_NS_wchar.h \
+  os_include/os_wchar.h \
+  os_include/os_string.h \
+  os_include/os_ctype.h \
+  OS_Dirent.h \
+  OS_String.h \
+  OS_TLI.h \
+  os_include/sys/os_mman.h \
+  Min_Max.h \
+  os_include/netinet/os_tcp.h \
+  os_include/os_assert.h \
+  os_include/os_termios.h \
+  os_include/os_aio.h \
+  os_include/sys/os_un.h \
+  os_include/os_syslog.h \
+  Object_Manager.h \
+  Recursive_Thread_Mutex.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -16918,7 +16959,6 @@ endif # GHS
   Malloc_T.h \
   Malloc_Allocator.h \
   Malloc_Base.h \
-  os_include/sys/os_mman.h \
   Free_List.h \
   Free_List.cpp \
   Free_List.i \
@@ -16927,7 +16967,6 @@ endif # GHS
   ACE.h \
   Flag_Manip.h \
   Flag_Manip.i \
-  OS_NS_fcntl.h \
   Handle_Ops.h \
   Handle_Ops.i \
   Lib_Find.h \
@@ -16935,19 +16974,8 @@ endif # GHS
   Init_ACE.h \
   Init_ACE.i \
   Sock_Connect.h \
-  os_include/netinet/os_in.h \
-  os_include/sys/os_socket.h \
-  os_include/sys/os_uio.h \
   Sock_Connect.i \
   ACE.i \
-  OS_NS_unistd.h \
-  Time_Value.h \
-  os_include/os_ctype.h \
-  OS_NS_sys_socket.h \
-  os_include/net/os_if.h \
-  OS_NS_stropts.h \
-  os_include/os_stropts.h \
-  OS_NS_string.h \
   Memory_Pool.h \
   Event_Handler.h \
   Atomic_Op.h \
@@ -16982,7 +17010,6 @@ endif # GHS
   Auto_Ptr.cpp \
   Auto_Ptr.i \
   String_Base.i \
-  Min_Max.h \
   XML_Svc_Conf.h \
   Reactor.h \
   Timer_Queuefwd.h \
@@ -16990,7 +17017,6 @@ endif # GHS
   Svc_Conf_Tokens.h \
   Parse_Node.h \
   DLL.h \
-  os_include/os_dlfcn.h \
   Svc_Conf_Lexer_Guard.h
 
 .obj/Svc_Conf_y.o .obj/Svc_Conf_y.so .shobj/Svc_Conf_y.o .shobj/Svc_Conf_y.so: Svc_Conf_y.cpp \
@@ -17169,7 +17195,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -17896,7 +17921,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -18007,7 +18031,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -18130,8 +18153,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -18261,7 +18282,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -18275,6 +18295,21 @@ endif # GHS
   Process_Mutex.h \
   Synch_T.h \
   Synch.h \
+  Auto_Event.h \
+  Event.h \
+  Barrier.h \
+  OS_NS_errno.h \
+  Condition_Thread_Mutex.h \
+  Condition_Recursive_Thread_Mutex.h \
+  Manual_Event.h \
+  Mutex.h \
+  Null_Barrier.h \
+  Null_Condition.h \
+  Null_Mutex.h \
+  Null_Semaphore.h \
+  Semaphore.h \
+  Thread_Semaphore.h \
+  TSS_Adapter.h \
   Lock_Adapter_T.h \
   Lock_Adapter_T.cpp \
   Lock_Adapter_T.inl \
@@ -18338,10 +18373,6 @@ endif # GHS
   OS_Memory.h \
   OS_NS_stdlib.h \
   OS_NS_signal.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -18638,7 +18669,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -19220,7 +19250,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -19391,10 +19420,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -19463,10 +19488,6 @@ endif # GHS
   Object_Manager_Base.h \
   Cleanup.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_stdio.h \
-  os_include/os_fcntl.h \
-  os_include/sys/os_stat.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
@@ -20320,7 +20341,6 @@ endif # GHS
   Object_Manager.h \
   Object_Manager_Base.h \
   Recursive_Thread_Mutex.h \
-  OS_NS_ctype.h \
   Static_Object_Lock.h \
   Managed_Object.h \
   Managed_Object.cpp \
diff --git a/ace/OS.cpp b/ace/OS.cpp
index b26d3dc3579..97a5de3a6cb 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -16,21 +16,10 @@
 
 ACE_RCSID(ace, OS, "$Id$")
 
-#if 0
-
-#if defined (ACE_WIN32)
-
-// = Static initialization.
-
-
-#endif /* WIN32 */
-
-
-#endif
-
 // include new cpps
 #include "ace/Cleanup.cpp"
 #include "ace/Object_Manager_Base.cpp"
+#include "ace/OS_main.cpp"
 #include "ace/OS_NS_arpa_inet.cpp"
 #include "ace/OS_NS_ctype.cpp"
 #include "ace/OS_NS_dirent.cpp"
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp
new file mode 100644
index 00000000000..036582ed57d
--- /dev/null
+++ b/ace/OS_main.cpp
@@ -0,0 +1,151 @@
+// -*- C++ -*-
+// $Id$
+
+#include "ace/OS_main.h"
+
+ACE_RCSID(ace, OS_main, "$Id$")
+
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
+
+#  if !defined (ACE_HAS_MINIMAL_ACE_OS)
+#    include "ace/Object_Manager.h"
+#  endif /* ! ACE_HAS_MINIMAL_ACE_OS */
+
+// Rename "main ()" on platforms that don't allow it to be called "main ()".
+
+// Also, create ACE_Object_Manager static instance(s) in "main ()".
+// ACE_MAIN_OBJECT_MANAGER defines the ACE_Object_Manager(s) that will
+// be instantiated on the stack of main ().  Note that it is only used
+// when compiling main ():  its value does not affect the contents of
+// ace/OS.o.
+#  if !defined (ACE_MAIN_OBJECT_MANAGER)
+#    define ACE_MAIN_OBJECT_MANAGER \
+        ACE_OS_Object_Manager ace_os_object_manager; \
+        ACE_Object_Manager ace_object_manager;
+#  endif /* ! ACE_MAIN_OBJECT_MANAGER */
+
+#  if !defined (ACE_WINCE)
+
+/* forward declaration */
+int ace_main_i (int, char *[]);
+
+#    if defined (ACE_PSOSIM)
+// PSOSIM root lacks the standard argc, argv command line parameters,
+// create dummy argc and argv in the "real" main  and pass to "user" main.
+// NOTE: ACE_MAIN must be defined to give the return type as well as the
+// name of the entry point.
+
+ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ 
+{
+  int argc = 1;                            /* dummy arg count */
+  char *argv[] = {"psosim"};               /* dummy arg list */
+  ACE_MAIN_OBJECT_MANAGER
+  int ret_val = -1; /* assume the worst */
+  if (ACE_PSOS_Time_t::init_simulator_time ()) /* init simulator time */
+  {
+    ACE_ERROR((LM_ERROR, "init_simulator_time failed\n"));  /* report */
+  }
+  else
+  {
+    ret_val = ace_main_i (argc, argv);   /* call user main, save result */
+  }
+  ACE_OS::exit (ret_val);                /* pass code to simulator exit */
+}
+
+#    elif defined (ACE_PSOS) && defined (ACE_PSOS_LACKS_ARGC_ARGV)
+// PSOS root lacks the standard argc, argv command line parameters,
+// create dummy argc and argv in the "real" main  and pass to "user" main.
+// Ignore return value from user main as well.  NOTE: ACE_MAIN must be
+// defined to give the return type as well as the name of the entry point
+
+ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ 
+{
+  int argc = 1;                           /* dummy arg count */
+  char *argv[] = {"root"};                /* dummy arg list */
+  ACE_MAIN_OBJECT_MANAGER
+  ace_main_i (argc, argv);                /* call user main, ignore result */
+}
+
+#    else /* ACE_PSOSIM */
+
+int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
+{ 
+  ACE_MAIN_OBJECT_MANAGER 
+  return ace_main_i (argc, argv);           /* what the user calls "main" */ 
+}
+
+#      if defined (ACE_WIN32)
+
+int
+ACE_WMAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., main */ 
+{
+  ACE_MAIN_OBJECT_MANAGER
+  return ace_os_main_i (argc, argv);           /* what the user calls "main" */
+} 
+
+#      endif /* ACE_WIN32 && UNICODE */
+
+#    endif /* ACE_PSOSIM */
+
+#  else /* ACE_WINCE */
+
+#    if defined (ACE_TMAIN)  // Use WinMain on CE; others give warning/error.
+#      undef ACE_TMAIN
+#    endif  // ACE_TMAIN
+
+// CE only gets a command line string;  no argv. So we need to convert it
+// when the main entrypoint expects argc/argv. ACE_ARGV supports this.
+#    include "ace/ARGV.h"
+
+// Support for ACE_TMAIN, which is a recommended way. It would be nice if
+// CE had CommandLineToArgvW()... but it's only on NT3.5 and up.
+
+int WINAPI ace_os_wintmain_i (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+  ACE_TCHAR cmdline[1024];
+  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
+  ACE_OS::strcat (cmdline, lpCmdLine);
+  ACE_ARGV ce_argv (cmdline);
+  ACE::init ();
+  ACE_MAIN_OBJECT_MANAGER
+  int i = ace_main_i (ce_argv.argc (), ce_argv.argv ());
+  ACE::fini ();
+  return i;
+}
+
+// Support for wchar_t but still can't fit to CE because of the command
+// line parameters.
+int WINAPI ace_os_winwmain_i (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+  ACE_TCHAR cmdline[1024];
+  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
+  ACE_OS::strcat (cmdline, lpCmdLine);
+  ACE_ARGV ce_argv (cmdline);
+  ACE::init ();
+  ACE_MAIN_OBJECT_MANAGER
+  int i = ace_main_i (ce_argv.argc (), ce_argv.argv ());
+  ACE::fini ();
+  return i;
+}
+
+// Supporting legacy 'main' is A LOT easier for users than changing existing
+// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro
+// expansion, so it needs to go out here.
+#    include "ace/Argv_Type_Converter.h"
+int WINAPI ace_os_winmain_i (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+  ACE_TCHAR cmdline[1024];
+  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
+  ACE_OS::strcat (cmdline, lpCmdLine);
+  ACE_ARGV ce_argv (cmdline);
+  ACE::init ();
+  ACE_MAIN_OBJECT_MANAGER
+  ACE_Argv_Type_Converter command_line (ce_argv.argc (), ce_argv.argv ());
+  int i = ace_main_i (command_line.get_argc(), command_line.get_ASCII_argv());
+  ACE::fini ();
+  return i;
+}
+int ace_main_i
+
+#  endif   /* !ACE_WINCE */
+# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
diff --git a/ace/OS_main.h b/ace/OS_main.h
index 6263408b02b..50b18a0dc61 100644
--- a/ace/OS_main.h
+++ b/ace/OS_main.h
@@ -14,13 +14,13 @@
  */
 //=============================================================================
 
+#include "ace/config-all.h"
+
 #ifndef ACE_OS_MAIN_H
 # define ACE_OS_MAIN_H
 
 # include /**/ "ace/pre.h"
 
-# include "ace/config-all.h"
-
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -45,68 +45,48 @@
 #   endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 # endif /* ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
-# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
-
-#   if !defined (ACE_HAS_MINIMAL_ACE_OS)
-#     include "ace/Object_Manager.h"
-#   endif /* ! ACE_HAS_MINIMAL_ACE_OS */
+# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) \
+       && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
 
 // Rename "main ()" on platforms that don't allow it to be called "main ()".
 
-// Also, create ACE_Object_Manager static instance(s) in "main ()".
-// ACE_MAIN_OBJECT_MANAGER defines the ACE_Object_Manager(s) that will
-// be instantiated on the stack of main ().  Note that it is only used
-// when compiling main ():  its value does not affect the contents of
-// ace/OS.o.
-#   if !defined (ACE_MAIN_OBJECT_MANAGER)
-#     define ACE_MAIN_OBJECT_MANAGER \
-        ACE_OS_Object_Manager ace_os_object_manager; \
-        ACE_Object_Manager ace_object_manager;
-#   endif /* ! ACE_MAIN_OBJECT_MANAGER */
-
-#   if defined (ACE_PSOSIM)
-// PSOSIM root lacks the standard argc, argv command line parameters,
-// create dummy argc and argv in the "real" main  and pass to "user" main.
-// NOTE: ACE_MAIN must be defined to give the return type as well as the
-// name of the entry point.
+#   if defined (ACE_PSOSIM) 
+         || (defined (ACE_PSOS) && defined (ACE_PSOS_LACKS_ARGC_ARGV))
+
 #     define main \
-ace_main_i (int, char *[]);                /* forward declaration */ \
+ace_os_main_i (int, char *[]); \
 ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 { \
-  int argc = 1;                            /* dummy arg count */ \
-  char *argv[] = {"psosim"};               /* dummy arg list */ \
-  ACE_MAIN_OBJECT_MANAGER \
-  int ret_val = -1; /* assume the worst */ \
-  if (ACE_PSOS_Time_t::init_simulator_time ()) /* init simulator time */ \
-  { \
-    ACE_ERROR((LM_ERROR, "init_simulator_time failed\n"));  /* report */ \
-  } \
-  else \
-  { \
-    ret_val = ace_main_i (argc, argv);   /* call user main, save result */ \
-  } \
-  ACE_OS::exit (ret_val);                /* pass code to simulator exit */ \
+  ace_os_main_i (argc, argv); /* what the user calls "main" */ \
 } \
 int \
 ace_main_i
-#   elif defined (ACE_PSOS) && defined (ACE_PSOS_LACKS_ARGC_ARGV)
-// PSOS root lacks the standard argc, argv command line parameters,
-// create dummy argc and argv in the "real" main  and pass to "user" main.
-// Ignore return value from user main as well.  NOTE: ACE_MAIN must be
-// defined to give the return type as well as the name of the entry point
+
+#   elif !defined (ACE_WINCE)
+   
 #     define main \
-ace_main_i (int, char *[]);               /* forward declaration */ \
-ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
+ace_os_main_i (int, char *[]); \
+int \
+ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
+{ \
+  return ace_os_main_i (argc, argv); /* what the user calls "main" */ \
+} \
+int \
+ace_main_i
+
+#     if defined (ACE_WIN32)
+#       define wmain \
+ace_os_wmain_i (int, ACE_TCHAR *[]);
+int \
+ACE_WMAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., wmain */ \
 { \
-  int argc = 1;                           /* dummy arg count */ \
-  char *argv[] = {"root"};                /* dummy arg list */ \
-  ACE_MAIN_OBJECT_MANAGER \
-  ace_main_i (argc, argv);                /* call user main, ignore result */ \
+  return ace_os_wmain_i (argc, argv);   /* what the user calls "main" */ \
 } \
 int \
 ace_main_i
+#     endif /* ACE_WIN32 */
 
-#   elif defined (ACE_HAS_WINCE)
+#   else /* ACE_HAS_WINCE */
 
 #     if defined (ACE_TMAIN)  // Use WinMain on CE; others give warning/error.
 #       undef ACE_TMAIN
@@ -120,36 +100,20 @@ ace_main_i
 // CE had CommandLineToArgvW()... but it's only on NT3.5 and up.
 
 #     define ACE_TMAIN \
-ace_main_i (int, ACE_TCHAR *[]);  /* forward declaration */ \
+ace_os_wintmain_i (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow);  /* forward declaration */ \
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
 { \
-  ACE_TCHAR cmdline[1024]; \
-  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program ")); \
-  ACE_OS::strcat (cmdline, lpCmdLine); \
-  ACE_ARGV ce_argv (cmdline); \
-  ACE::init (); \
-  ACE_MAIN_OBJECT_MANAGER \
-  int i = ace_main_i (ce_argv.argc (), ce_argv.argv ()); \
-  ACE::fini (); \
-  return i; \
+  return ace_os_wintmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
 } \
 int ace_main_i
 
 // Support for wchar_t but still can't fit to CE because of the command
 // line parameters.
 #     define wmain \
-ace_main_i (int, ACE_TCHAR *[]);  /* forward declaration */ \
+ace_os_winwmain_i (int, ACE_TCHAR *[]);  /* forward declaration */ \
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
 { \
-  ACE_TCHAR cmdline[1024]; \
-  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program ")); \
-  ACE_OS::strcat (cmdline, lpCmdLine); \
-  ACE_ARGV ce_argv (cmdline); \
-  ACE::init (); \
-  ACE_MAIN_OBJECT_MANAGER \
-  int i = ace_main_i (ce_argv.argc (), ce_argv.argv ()); \
-  ACE::fini (); \
-  return i; \
+  return ace_os_winwmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
 } \
 int ace_main_i
 
@@ -158,45 +122,13 @@ int ace_main_i
 // expansion, so it needs to go out here.
 #     include "ace/Argv_Type_Converter.h"
 #     define main \
-ace_main_i (int, char *[]);  /* forward declaration */ \
+ace_os_winmain_i (int, char *[]);  /* forward declaration */ \
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
 { \
-  ACE_TCHAR cmdline[1024]; \
-  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program ")); \
-  ACE_OS::strcat (cmdline, lpCmdLine); \
-  ACE_ARGV ce_argv (cmdline); \
-  ACE::init (); \
-  ACE_MAIN_OBJECT_MANAGER \
-  ACE_Argv_Type_Converter command_line (ce_argv.argc (), ce_argv.argv ()); \
-  int i = ace_main_i (command_line.get_argc(), command_line.get_ASCII_argv());\
-  ACE::fini (); \
-  return i; \
+  return ace_os_winmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
 } \
 int ace_main_i
 
-#   else
-#     define main \
-ace_main_i (int, char *[]);                  /* forward declaration */ \
-int \
-ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \
-{ \
-  ACE_MAIN_OBJECT_MANAGER \
-  return ace_main_i (argc, argv);           /* what the user calls "main" */ \
-} \
-int \
-ace_main_i
-#     if defined (ACE_WIN32)
-#     define wmain \
-ace_main_i (int, ACE_TCHAR *[]);                  /* forward declaration */ \
-int \
-ACE_WMAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., main */ \
-{ \
-  ACE_MAIN_OBJECT_MANAGER \
-  return ace_main_i (argc, argv);           /* what the user calls "main" */ \
-} \
-int \
-ace_main_i
-#     endif /* ACE_WIN32 && UNICODE */
 #   endif   /* ACE_PSOSIM */
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
diff --git a/ace/RMCast/Makefile b/ace/RMCast/Makefile
index 6871b2c5a30..48495c63530 100644
--- a/ace/RMCast/Makefile
+++ b/ace/RMCast/Makefile
@@ -194,6 +194,38 @@ endif
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
@@ -253,12 +285,70 @@ endif
   $(ACE_ROOT)/ace/os_include/sys/os_time.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/OS_NS_Thread.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/os_include/os_errno.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
+  $(ACE_ROOT)/ace/os_include/os_semaphore.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_NS_stdlib.h \
+  $(ACE_ROOT)/ace/OS_NS_signal.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Lock.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
   $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
+  $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/RW_Mutex.h \
+  $(ACE_ROOT)/ace/RW_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/Guard_T.h \
+  $(ACE_ROOT)/ace/Guard_T.cpp \
+  $(ACE_ROOT)/ace/Guard_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_Traits.h \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -349,19 +439,53 @@ endif
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
   $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_Traits.h \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h \
   RMCast_Module_Factory.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Timer_Queuefwd.h \
-  $(ACE_ROOT)/ace/Synch_Traits.h \
   $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
@@ -371,8 +495,7 @@ endif
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/OS_NS_string.h \
   $(ACE_ROOT)/ace/OS_NS_sys_select.h \
-  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
-  $(ACE_ROOT)/ace/OS_NS_unistd.h
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h
 
 .obj/RMCast_Membership.o .obj/RMCast_Membership.so .shobj/RMCast_Membership.o .shobj/RMCast_Membership.so: RMCast_Membership.cpp RMCast_Membership.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -599,7 +722,6 @@ endif
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager_Base.h \
   $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
-  $(ACE_ROOT)/ace/OS_NS_ctype.h \
   $(ACE_ROOT)/ace/Static_Object_Lock.h \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
@@ -772,7 +894,6 @@ endif
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager_Base.h \
   $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
-  $(ACE_ROOT)/ace/OS_NS_ctype.h \
   $(ACE_ROOT)/ace/Static_Object_Lock.h \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
@@ -1159,6 +1280,38 @@ endif
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   RMCast_Resend_Handler.i
 
 .obj/RMCast_Resend_Worker.o .obj/RMCast_Resend_Worker.so .shobj/RMCast_Resend_Worker.o .shobj/RMCast_Resend_Worker.so: RMCast_Resend_Worker.cpp RMCast_Resend_Worker.h \
@@ -1318,6 +1471,38 @@ endif
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   RMCast_Proxy.h RMCast_Ack_Worker.h RMCast_Resend_Worker.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -1495,7 +1680,42 @@ endif
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
   $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   RMCast_UDP_Event_Handler.i
 
 .obj/RMCast_UDP_Proxy.o .obj/RMCast_UDP_Proxy.so .shobj/RMCast_UDP_Proxy.o .shobj/RMCast_UDP_Proxy.so: RMCast_UDP_Proxy.cpp RMCast_UDP_Proxy.h \
@@ -1582,9 +1802,45 @@ endif
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
   $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_Traits.h \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -1677,19 +1933,53 @@ endif
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
   $(ACE_ROOT)/ace/Null_Mutex.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
+  $(ACE_ROOT)/ace/Synch_Traits.h \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
   RMCast_UDP_Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Synch_Traits.h \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Timer_Queuefwd.h \
   $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
   RMCast_UDP_Reliable_Receiver.i
 
 .obj/RMCast_UDP_Reliable_Sender.o .obj/RMCast_UDP_Reliable_Sender.so .shobj/RMCast_UDP_Reliable_Sender.o .shobj/RMCast_UDP_Reliable_Sender.so: RMCast_UDP_Reliable_Sender.cpp \
@@ -1778,13 +2068,46 @@ endif
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Auto_Event.h \
+  $(ACE_ROOT)/ace/Event.h \
+  $(ACE_ROOT)/ace/Barrier.h \
+  $(ACE_ROOT)/ace/OS_NS_errno.h \
+  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Manual_Event.h \
+  $(ACE_ROOT)/ace/Mutex.h \
+  $(ACE_ROOT)/ace/OS_NS_unistd.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Null_Barrier.h \
+  $(ACE_ROOT)/ace/Null_Condition.h \
   $(ACE_ROOT)/ace/Null_Mutex.h \
-  RMCast_Sequencer.h \
+  $(ACE_ROOT)/ace/Null_Semaphore.h \
+  $(ACE_ROOT)/ace/Semaphore.h \
+  $(ACE_ROOT)/ace/Thread_Semaphore.h \
+  $(ACE_ROOT)/ace/TSS_Adapter.h \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.h \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \
+  $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.h \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \
+  $(ACE_ROOT)/ace/Reverse_Lock_T.inl \
+  $(ACE_ROOT)/ace/TSS_T.h \
+  $(ACE_ROOT)/ace/TSS_T.cpp \
+  $(ACE_ROOT)/ace/TSS_T.inl \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_NS_stdio.h \
+  $(ACE_ROOT)/ace/Condition_T.h \
+  $(ACE_ROOT)/ace/Condition_T.cpp \
+  $(ACE_ROOT)/ace/Condition_T.inl \
   $(ACE_ROOT)/ace/Synch_Traits.h \
-  $(ACE_ROOT)/ace/Thread_Mutex.h \
-  RMCast_Retransmission.h RMCast_Copy_On_Write.h RMCast_Worker.h \
-  RMCast_Worker.cpp RMCast_Worker.i \
-  $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  RMCast_Sequencer.h RMCast_Retransmission.h RMCast_Copy_On_Write.h \
+  RMCast_Worker.h RMCast_Worker.cpp RMCast_Worker.i \
   RMCast_Copy_On_Write.cpp RMCast_Copy_On_Write.i \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
@@ -1801,8 +2124,6 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.h \
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/OS_NS_unistd.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
diff --git a/ace/ace.mpc b/ace/ace.mpc
index c83356dba18..58abe632d99 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -25,6 +25,7 @@ project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor {
       Time_Value.cpp
       Cleanup.cpp
       Object_Manager_Base.cpp
+      OS_main.cpp
       OS_NS_arpa_inet.cpp
       OS_NS_ctype.cpp
       OS_NS_dirent.cpp