summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ACEXML/common/URL_Addr.inl3
-rw-r--r--ACE/ACEXML/parser/parser/ParserContext.inl3
-rw-r--r--ACE/ace/ACE.inl3
-rw-r--r--ACE/ace/ATM_Acceptor.inl3
-rw-r--r--ACE/ace/ATM_Addr.inl3
-rw-r--r--ACE/ace/ATM_Connector.inl3
-rw-r--r--ACE/ace/ATM_Params.inl3
-rw-r--r--ACE/ace/ATM_QoS.inl3
-rw-r--r--ACE/ace/Activation_Queue.inl3
-rw-r--r--ACE/ace/Active_Map_Manager.inl3
-rw-r--r--ACE/ace/Active_Map_Manager_T.inl3
-rw-r--r--ACE/ace/Addr.inl3
-rw-r--r--ACE/ace/Argv_Type_Converter.inl3
-rw-r--r--ACE/ace/Array_Base.inl3
-rw-r--r--ACE/ace/Array_Map.inl3
-rw-r--r--ACE/ace/Asynch_IO_Impl.inl3
-rw-r--r--ACE/ace/Atomic_Op_T.inl3
-rw-r--r--ACE/ace/Auto_Event.inl3
-rw-r--r--ACE/ace/Auto_Functor.inl3
-rw-r--r--ACE/ace/Auto_IncDec_T.inl3
-rw-r--r--ACE/ace/Auto_Ptr.inl3
-rw-r--r--ACE/ace/Barrier.inl3
-rw-r--r--ACE/ace/Base_Thread_Adapter.inl3
-rw-r--r--ACE/ace/Based_Pointer_T.inl3
-rw-r--r--ACE/ace/Basic_Stats.inl3
-rw-r--r--ACE/ace/CDR_Base.inl3
-rw-r--r--ACE/ace/CDR_Size.inl3
-rw-r--r--ACE/ace/CDR_Stream.inl3
-rw-r--r--ACE/ace/Capabilities.inl3
-rw-r--r--ACE/ace/Cleanup.inl3
-rw-r--r--ACE/ace/Condition_T.inl3
-rw-r--r--ACE/ace/Configuration.inl3
-rw-r--r--ACE/ace/Containers.inl3
-rw-r--r--ACE/ace/Containers_T.inl3
-rw-r--r--ACE/ace/Countdown_Time_T.inl3
-rw-r--r--ACE/ace/DEV.inl3
-rw-r--r--ACE/ace/DEV_Addr.inl3
-rw-r--r--ACE/ace/DEV_Connector.inl3
-rw-r--r--ACE/ace/DEV_IO.inl3
-rw-r--r--ACE/ace/Date_Time.inl3
-rw-r--r--ACE/ace/Dirent.inl3
-rw-r--r--ACE/ace/Dirent_Selector.inl3
-rw-r--r--ACE/ace/Dump_T.cpp3
-rw-r--r--ACE/ace/Dynamic.inl3
-rw-r--r--ACE/ace/Dynamic_Message_Strategy.inl3
-rw-r--r--ACE/ace/Dynamic_Service.inl3
-rw-r--r--ACE/ace/Event_Handler.inl3
-rw-r--r--ACE/ace/Event_Handler_T.cpp3
-rw-r--r--ACE/ace/FIFO.inl3
-rw-r--r--ACE/ace/FIFO_Recv.inl3
-rw-r--r--ACE/ace/FIFO_Recv_Msg.inl3
-rw-r--r--ACE/ace/FIFO_Send.inl3
-rw-r--r--ACE/ace/FIFO_Send_Msg.inl3
-rw-r--r--ACE/ace/FILE.inl3
-rw-r--r--ACE/ace/FILE_Addr.inl3
-rw-r--r--ACE/ace/FILE_Connector.inl3
-rw-r--r--ACE/ace/FILE_IO.inl3
-rw-r--r--ACE/ace/File_Lock.inl3
-rw-r--r--ACE/ace/Flag_Manip.inl3
-rw-r--r--ACE/ace/Functor_String.inl3
-rw-r--r--ACE/ace/Functor_T.inl3
-rw-r--r--ACE/ace/Handle_Gobbler.inl3
-rw-r--r--ACE/ace/Handle_Set.inl3
-rw-r--r--ACE/ace/Hash_Map_Manager_T.inl3
-rw-r--r--ACE/ace/Hash_Multi_Map_Manager_T.inl3
-rw-r--r--ACE/ace/INET_Addr.inl3
-rw-r--r--ACE/ace/IOStream_T.inl3
-rw-r--r--ACE/ace/IPC_SAP.inl3
-rw-r--r--ACE/ace/Intrusive_Auto_Ptr.inl3
-rw-r--r--ACE/ace/Intrusive_List.inl3
-rw-r--r--ACE/ace/Intrusive_List_Node.inl3
-rw-r--r--ACE/ace/LSOCK.inl3
-rw-r--r--ACE/ace/LSOCK_CODgram.inl3
-rw-r--r--ACE/ace/LSOCK_Connector.inl3
-rw-r--r--ACE/ace/LSOCK_Dgram.inl3
-rw-r--r--ACE/ace/LSOCK_Stream.inl3
-rw-r--r--ACE/ace/Local_Tokens.inl3
-rw-r--r--ACE/ace/Lock.inl3
-rw-r--r--ACE/ace/Lock_Adapter_T.inl3
-rw-r--r--ACE/ace/Log_Category.inl3
-rw-r--r--ACE/ace/Log_Record.inl3
-rw-r--r--ACE/ace/MEM_Acceptor.inl3
-rw-r--r--ACE/ace/MEM_Addr.inl3
-rw-r--r--ACE/ace/MEM_Connector.inl3
-rw-r--r--ACE/ace/MEM_IO.inl3
-rw-r--r--ACE/ace/MEM_SAP.inl3
-rw-r--r--ACE/ace/MEM_Stream.inl3
-rw-r--r--ACE/ace/MMAP_Memory_Pool.inl3
-rw-r--r--ACE/ace/Malloc.inl3
-rw-r--r--ACE/ace/Malloc_Allocator.inl3
-rw-r--r--ACE/ace/Malloc_T.inl3
-rw-r--r--ACE/ace/Managed_Object.inl3
-rw-r--r--ACE/ace/Manual_Event.inl3
-rw-r--r--ACE/ace/Map_Manager.inl3
-rw-r--r--ACE/ace/Map_T.inl3
-rw-r--r--ACE/ace/Mem_Map.inl3
-rw-r--r--ACE/ace/Message_Block.inl3
-rw-r--r--ACE/ace/Message_Block_T.inl3
-rw-r--r--ACE/ace/Message_Queue.inl3
-rw-r--r--ACE/ace/Message_Queue_NT.inl3
-rw-r--r--ACE/ace/Message_Queue_Vx.inl3
-rw-r--r--ACE/ace/Metrics_Cache_T.inl3
-rw-r--r--ACE/ace/Module.inl3
-rw-r--r--ACE/ace/Monotonic_Time_Policy.inl3
-rw-r--r--ACE/ace/Msg_WFMO_Reactor.inl3
-rw-r--r--ACE/ace/Multihomed_INET_Addr.inl3
-rw-r--r--ACE/ace/Mutex.inl3
-rw-r--r--ACE/ace/NT_Service.inl3
-rw-r--r--ACE/ace/OS_Errno.inl3
-rw-r--r--ACE/ace/OS_Log_Msg_Attributes.inl3
-rw-r--r--ACE/ace/OS_NS_Thread.inl3
-rw-r--r--ACE/ace/OS_NS_ctype.inl3
-rw-r--r--ACE/ace/OS_NS_dirent.inl3
-rw-r--r--ACE/ace/OS_NS_dlfcn.inl3
-rw-r--r--ACE/ace/OS_NS_errno.inl3
-rw-r--r--ACE/ace/OS_NS_fcntl.inl3
-rw-r--r--ACE/ace/OS_NS_netdb.inl3
-rw-r--r--ACE/ace/OS_NS_poll.inl3
-rw-r--r--ACE/ace/OS_NS_pwd.inl3
-rw-r--r--ACE/ace/OS_NS_stdio.inl3
-rw-r--r--ACE/ace/OS_NS_stdlib.inl3
-rw-r--r--ACE/ace/OS_NS_string.inl3
-rw-r--r--ACE/ace/OS_NS_strings.inl3
-rw-r--r--ACE/ace/OS_NS_stropts.inl3
-rw-r--r--ACE/ace/OS_NS_sys_mman.inl3
-rw-r--r--ACE/ace/OS_NS_sys_msg.inl3
-rw-r--r--ACE/ace/OS_NS_sys_resource.inl3
-rw-r--r--ACE/ace/OS_NS_sys_select.inl3
-rw-r--r--ACE/ace/OS_NS_sys_sendfile.inl3
-rw-r--r--ACE/ace/OS_NS_sys_shm.inl3
-rw-r--r--ACE/ace/OS_NS_sys_stat.inl3
-rw-r--r--ACE/ace/OS_NS_sys_time.inl3
-rw-r--r--ACE/ace/OS_NS_sys_uio.inl3
-rw-r--r--ACE/ace/OS_NS_sys_wait.inl3
-rw-r--r--ACE/ace/OS_NS_time.inl3
-rw-r--r--ACE/ace/OS_NS_unistd.inl3
-rw-r--r--ACE/ace/OS_NS_wchar.inl3
-rw-r--r--ACE/ace/OS_TLI.inl3
-rw-r--r--ACE/ace/Obchunk.inl3
-rw-r--r--ACE/ace/Object_Manager.inl3
-rw-r--r--ACE/ace/PI_Malloc.inl3
-rw-r--r--ACE/ace/POSIX_Proactor.inl3
-rw-r--r--ACE/ace/Pagefile_Memory_Pool.inl3
-rw-r--r--ACE/ace/Pair_T.inl3
-rw-r--r--ACE/ace/Ping_Socket.inl3
-rw-r--r--ACE/ace/Pipe.inl3
-rw-r--r--ACE/ace/Proactor.inl3
-rw-r--r--ACE/ace/Process.inl3
-rw-r--r--ACE/ace/Process_Manager.inl3
-rw-r--r--ACE/ace/Process_Mutex.inl3
-rw-r--r--ACE/ace/Process_Semaphore.inl3
-rw-r--r--ACE/ace/Profile_Timer.inl3
-rw-r--r--ACE/ace/QoS/QoS_Session_Impl.inl3
-rw-r--r--ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl3
-rw-r--r--ACE/ace/RB_Tree.inl3
-rw-r--r--ACE/ace/RW_Mutex.inl3
-rw-r--r--ACE/ace/RW_Process_Mutex.inl3
-rw-r--r--ACE/ace/RW_Thread_Mutex.inl3
-rw-r--r--ACE/ace/Reactor.inl3
-rw-r--r--ACE/ace/Reactor_Notification_Strategy.inl3
-rw-r--r--ACE/ace/Read_Buffer.inl3
-rw-r--r--ACE/ace/Recursive_Thread_Mutex.inl3
-rw-r--r--ACE/ace/Refcounted_Auto_Ptr.inl3
-rw-r--r--ACE/ace/Remote_Tokens.inl3
-rw-r--r--ACE/ace/Reverse_Lock_T.inl3
-rw-r--r--ACE/ace/SOCK.inl3
-rw-r--r--ACE/ace/SOCK_Acceptor.inl3
-rw-r--r--ACE/ace/SOCK_CODgram.inl3
-rw-r--r--ACE/ace/SOCK_Connector.inl3
-rw-r--r--ACE/ace/SOCK_Dgram.inl3
-rw-r--r--ACE/ace/SOCK_Dgram_Bcast.inl3
-rw-r--r--ACE/ace/SOCK_Dgram_Mcast.inl3
-rw-r--r--ACE/ace/SOCK_IO.inl3
-rw-r--r--ACE/ace/SOCK_SEQPACK_Acceptor.inl3
-rw-r--r--ACE/ace/SOCK_SEQPACK_Association.inl3
-rw-r--r--ACE/ace/SOCK_SEQPACK_Connector.inl3
-rw-r--r--ACE/ace/SOCK_Stream.inl3
-rw-r--r--ACE/ace/SPIPE.inl3
-rw-r--r--ACE/ace/SPIPE_Addr.inl3
-rw-r--r--ACE/ace/SPIPE_Connector.inl3
-rw-r--r--ACE/ace/SPIPE_Stream.inl3
-rw-r--r--ACE/ace/SSL/SSL_Asynch_Stream.inl3
-rw-r--r--ACE/ace/SSL/SSL_Context.inl3
-rw-r--r--ACE/ace/SSL/SSL_SOCK.inl3
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Acceptor.cpp3
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Acceptor.inl3
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Connector.cpp3
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Connector.inl3
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.inl3
-rw-r--r--ACE/ace/SSL/ssl_for_tao.mpc3
-rw-r--r--ACE/ace/SString.inl3
-rw-r--r--ACE/ace/SV_Message.inl3
-rw-r--r--ACE/ace/SV_Message_Queue.inl3
-rw-r--r--ACE/ace/SV_Semaphore_Complex.inl3
-rw-r--r--ACE/ace/SV_Semaphore_Simple.inl3
-rw-r--r--ACE/ace/SV_Shared_Memory.inl3
-rw-r--r--ACE/ace/Select_Reactor_Base.inl3
-rw-r--r--ACE/ace/Select_Reactor_T.inl3
-rw-r--r--ACE/ace/Semaphore.inl3
-rw-r--r--ACE/ace/Service_Config.inl3
-rw-r--r--ACE/ace/Service_Gestalt.inl3
-rw-r--r--ACE/ace/Service_Repository.inl3
-rw-r--r--ACE/ace/Service_Types.inl3
-rw-r--r--ACE/ace/Shared_Memory_MM.inl3
-rw-r--r--ACE/ace/Shared_Memory_SV.inl3
-rw-r--r--ACE/ace/Shared_Object.inl3
-rw-r--r--ACE/ace/Sig_Handler.inl3
-rw-r--r--ACE/ace/Signal.inl3
-rw-r--r--ACE/ace/Singleton.inl3
-rw-r--r--ACE/ace/Stats.inl3
-rw-r--r--ACE/ace/Strategies_T.inl3
-rw-r--r--ACE/ace/Stream.inl3
-rw-r--r--ACE/ace/String_Base.inl3
-rw-r--r--ACE/ace/TLI_Connector.inl3
-rw-r--r--ACE/ace/TLI_Stream.inl3
-rw-r--r--ACE/ace/TP_Reactor.inl3
-rw-r--r--ACE/ace/TSS_T.inl3
-rw-r--r--ACE/ace/Task.inl3
-rw-r--r--ACE/ace/Task_Ex_T.inl3
-rw-r--r--ACE/ace/Task_T.inl3
-rw-r--r--ACE/ace/Thread.inl3
-rw-r--r--ACE/ace/Thread_Adapter.inl3
-rw-r--r--ACE/ace/Thread_Manager.inl3
-rw-r--r--ACE/ace/Thread_Mutex.inl3
-rw-r--r--ACE/ace/Thread_Semaphore.inl3
-rw-r--r--ACE/ace/Time_Policy.inl3
-rw-r--r--ACE/ace/Time_Policy_T.inl3
-rw-r--r--ACE/ace/Time_Value.inl3
-rw-r--r--ACE/ace/Time_Value_T.inl3
-rw-r--r--ACE/ace/Timeprobe.inl3
-rw-r--r--ACE/ace/Timer_Queue_Adapters.inl3
-rw-r--r--ACE/ace/Timer_Queue_Iterator.inl3
-rw-r--r--ACE/ace/Timer_Queue_T.inl3
-rw-r--r--ACE/ace/Token.inl3
-rw-r--r--ACE/ace/Token_Collection.inl3
-rw-r--r--ACE/ace/Token_Manager.inl3
-rw-r--r--ACE/ace/Token_Request_Reply.inl3
-rw-r--r--ACE/ace/Typed_SV_Message.inl3
-rw-r--r--ACE/ace/Typed_SV_Message_Queue.inl3
-rw-r--r--ACE/ace/UNIX_Addr.inl3
-rw-r--r--ACE/ace/UPIPE_Acceptor.inl3
-rw-r--r--ACE/ace/UPIPE_Connector.inl3
-rw-r--r--ACE/ace/UPIPE_Stream.inl3
-rw-r--r--ACE/ace/Unbounded_Queue.inl3
-rw-r--r--ACE/ace/Unbounded_Set.inl3
-rw-r--r--ACE/ace/Unbounded_Set_Ex.inl3
-rw-r--r--ACE/ace/Vector_T.inl3
-rw-r--r--ACE/ace/WFMO_Reactor.inl3
-rw-r--r--ACE/ace/XTI_ATM_Mcast.inl3
-rw-r--r--ACE/ace/ace_for_tao.mpc3
-rw-r--r--ACE/ace/ace_wchar.cpp3
-rw-r--r--ACE/ace/ace_wchar.inl3
-rw-r--r--ACE/ace/config-g++-common.h3
-rw-r--r--ACE/ace/config-icc-common.h3
-rw-r--r--ACE/ace/config-linux.h3
-rw-r--r--ACE/ace/config-suncc-common.h3
-rw-r--r--ACE/apps/JAWS/clients/Caching/Local_Locator.inl3
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Properties.inl3
-rw-r--r--ACE/apps/JAWS3/jaws3/Concurrency.h3
-rw-r--r--ACE/apps/JAWS3/jaws3/FILE.h3
-rwxr-xr-xACE/bin/zap_svn_id.pl5
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h3
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h3
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl3
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h3
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h3
-rw-r--r--ACE/examples/Service_Configurator/Misc/Timer_Service.h3
-rw-r--r--ACE/netsvcs/clients/Naming/Client/Client_Test.h3
-rw-r--r--ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h3
-rw-r--r--ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h3
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Channel.inl3
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Filter.inl3
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl3
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl3
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Session.inl3
-rw-r--r--ACE/protocols/ace/INet/AuthenticationBase.inl3
-rw-r--r--ACE/protocols/ace/INet/ClientRequestHandler.inl3
-rw-r--r--ACE/protocols/ace/INet/ConnectionCache.inl3
-rw-r--r--ACE/protocols/ace/INet/FTP_ClientRequestHandler.inl3
-rw-r--r--ACE/protocols/ace/INet/FTP_IOStream.inl3
-rw-r--r--ACE/protocols/ace/INet/FTP_Request.inl3
-rw-r--r--ACE/protocols/ace/INet/FTP_Response.inl3
-rw-r--r--ACE/protocols/ace/INet/FTP_URL.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTPS_Context.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTPS_URL.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_BasicAuthentication.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_ClientRequestHandler.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_Header.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_IOStream.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_Request.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_Response.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_SessionBase.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_Status.inl3
-rw-r--r--ACE/protocols/ace/INet/HTTP_URL.inl3
-rw-r--r--ACE/protocols/ace/INet/HeaderBase.inl3
-rw-r--r--ACE/protocols/ace/INet/SSL_CallbackManager.inl3
-rw-r--r--ACE/protocols/ace/INet/SSL_CertificateCallback.inl3
-rw-r--r--ACE/protocols/ace/INet/SSL_X509Cert.inl3
-rw-r--r--ACE/protocols/ace/INet/URLBase.inl3
-rwxr-xr-xACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc3
-rw-r--r--ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc3
-rwxr-xr-xACE/protocols/tests/HTBP/ping/ping.mpc3
302 files changed, 5 insertions, 903 deletions
diff --git a/ACE/ACEXML/common/URL_Addr.inl b/ACE/ACEXML/common/URL_Addr.inl
index b1ac1db8322..169350eaed6 100644
--- a/ACE/ACEXML/common/URL_Addr.inl
+++ b/ACE/ACEXML/common/URL_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/INET_Addr.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/ACEXML/parser/parser/ParserContext.inl b/ACE/ACEXML/parser/parser/ParserContext.inl
index b8f30ea248d..e2921519cbe 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.inl
+++ b/ACE/ACEXML/parser/parser/ParserContext.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include <algorithm>
ACEXML_INLINE
diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl
index 758a88a11a1..c3ba79ed3eb 100644
--- a/ACE/ace/ACE.inl
+++ b/ACE/ace/ACE.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_Thread.h"
#include "ace/OS_NS_ctype.h"
diff --git a/ACE/ace/ATM_Acceptor.inl b/ACE/ace/ATM_Acceptor.inl
index c840e8b845d..8e4aef7fa02 100644
--- a/ACE/ace/ATM_Acceptor.inl
+++ b/ACE/ace/ATM_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Open versioned namespace, if enabled by the user.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/ATM_Addr.inl b/ACE/ace/ATM_Addr.inl
index 8120c6d11d5..d1f7e2c4d18 100644
--- a/ACE/ace/ATM_Addr.inl
+++ b/ACE/ace/ATM_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE u_char
diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl
index 8f0af562bd4..e35f4085466 100644
--- a/ACE/ace/ATM_Connector.inl
+++ b/ACE/ace/ATM_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Open versioned namespace, if enabled by the user.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/ATM_Params.inl b/ACE/ace/ATM_Params.inl
index 5d60f6ba920..59ec331b53e 100644
--- a/ACE/ace/ATM_Params.inl
+++ b/ACE/ace/ATM_Params.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/ACE/ace/ATM_QoS.inl b/ACE/ace/ATM_QoS.inl
index 283baa3f560..479079e993e 100644
--- a/ACE/ace/ATM_QoS.inl
+++ b/ACE/ace/ATM_QoS.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/ACE/ace/Activation_Queue.inl b/ACE/ace/Activation_Queue.inl
index 50127f607d1..b464dbdef10 100644
--- a/ACE/ace/Activation_Queue.inl
+++ b/ACE/ace/Activation_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE size_t
diff --git a/ACE/ace/Active_Map_Manager.inl b/ACE/ace/Active_Map_Manager.inl
index 652cf7c1f71..2fc8c13e5d9 100644
--- a/ACE/ace/Active_Map_Manager.inl
+++ b/ACE/ace/Active_Map_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Active_Map_Manager_T.inl b/ACE/ace/Active_Map_Manager_T.inl
index 124f76c48c4..c8a6caf9b52 100644
--- a/ACE/ace/Active_Map_Manager_T.inl
+++ b/ACE/ace/Active_Map_Manager_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T> ACE_INLINE int
diff --git a/ACE/ace/Addr.inl b/ACE/ace/Addr.inl
index dc8e9286dc1..ad6f03e216a 100644
--- a/ACE/ace/Addr.inl
+++ b/ACE/ace/Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Return the address of the address.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Argv_Type_Converter.inl b/ACE/ace/Argv_Type_Converter.inl
index 5bb0bafd2db..8c7bc89ca89 100644
--- a/ACE/ace/Argv_Type_Converter.inl
+++ b/ACE/ace/Argv_Type_Converter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_TCHAR**
diff --git a/ACE/ace/Array_Base.inl b/ACE/ace/Array_Base.inl
index 849bcc18de2..ccd367f2d98 100644
--- a/ACE/ace/Array_Base.inl
+++ b/ACE/ace/Array_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Clean up the array (e.g., delete dynamically allocated memory).
diff --git a/ACE/ace/Array_Map.inl b/ACE/ace/Array_Map.inl
index 86a26d3f3aa..c331fae801e 100644
--- a/ACE/ace/Array_Map.inl
+++ b/ACE/ace/Array_Map.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename Key, typename Value, class EqualTo>
diff --git a/ACE/ace/Asynch_IO_Impl.inl b/ACE/ace/Asynch_IO_Impl.inl
index 495a768a972..e6fce33b386 100644
--- a/ACE/ace/Asynch_IO_Impl.inl
+++ b/ACE/ace/Asynch_IO_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Atomic_Op_T.inl b/ACE/ace/Atomic_Op_T.inl
index df549538e2b..1b1eb988f94 100644
--- a/ACE/ace/Atomic_Op_T.inl
+++ b/ACE/ace/Atomic_Op_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
#include <algorithm>
diff --git a/ACE/ace/Auto_Event.inl b/ACE/ace/Auto_Event.inl
index 8f7d769dcfd..919c048d3ce 100644
--- a/ACE/ace/Auto_Event.inl
+++ b/ACE/ace/Auto_Event.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TIME_POLICY>
diff --git a/ACE/ace/Auto_Functor.inl b/ACE/ace/Auto_Functor.inl
index 01dd208df1a..be0c38361aa 100644
--- a/ACE/ace/Auto_Functor.inl
+++ b/ACE/ace/Auto_Functor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename X, typename Functor> ACE_INLINE
diff --git a/ACE/ace/Auto_IncDec_T.inl b/ACE/ace/Auto_IncDec_T.inl
index 51daac0e84d..cb214488861 100644
--- a/ACE/ace/Auto_IncDec_T.inl
+++ b/ACE/ace/Auto_IncDec_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Implicitly and automatically increment the counter.
diff --git a/ACE/ace/Auto_Ptr.inl b/ACE/ace/Auto_Ptr.inl
index 57adb236261..a172ea9dc09 100644
--- a/ACE/ace/Auto_Ptr.inl
+++ b/ACE/ace/Auto_Ptr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Barrier.inl b/ACE/ace/Barrier.inl
index 9ab5c9fb111..f742deeb6e2 100644
--- a/ACE/ace/Barrier.inl
+++ b/ACE/ace/Barrier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Base_Thread_Adapter.inl b/ACE/ace/Base_Thread_Adapter.inl
index 7fa3959034b..febce6f49c6 100644
--- a/ACE/ace/Base_Thread_Adapter.inl
+++ b/ACE/ace/Base_Thread_Adapter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE long
diff --git a/ACE/ace/Based_Pointer_T.inl b/ACE/ace/Based_Pointer_T.inl
index 4d6b86e0c41..04ab75831b4 100644
--- a/ACE/ace/Based_Pointer_T.inl
+++ b/ACE/ace/Based_Pointer_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (P)->target_)
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/Basic_Stats.inl b/ACE/ace/Basic_Stats.inl
index bbdce099907..185478ab7f8 100644
--- a/ACE/ace/Basic_Stats.inl
+++ b/ACE/ace/Basic_Stats.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl
index fef29b6dc0e..cdd6fc56d6a 100644
--- a/ACE/ace/CDR_Base.inl
+++ b/ACE/ace/CDR_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_INTRINSIC_BYTESWAP)
// Take advantage of MSVC++ byte swapping compiler intrinsics (found
// in <stdlib.h>).
diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl
index 2527af22989..fe04ea99955 100644
--- a/ACE/ace/CDR_Size.inl
+++ b/ACE/ace/CDR_Size.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl
index 833dcda46ae..6b79c4c6bc9 100644
--- a/ACE/ace/CDR_Stream.inl
+++ b/ACE/ace/CDR_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/OS_Memory.h"
diff --git a/ACE/ace/Capabilities.inl b/ACE/ace/Capabilities.inl
index 053e0ecf7b6..0579ae6cd98 100644
--- a/ACE/ace/Capabilities.inl
+++ b/ACE/ace/Capabilities.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Cleanup.inl b/ACE/ace/Cleanup.inl
index 2f3410a1ebb..fdae3412f65 100644
--- a/ACE/ace/Cleanup.inl
+++ b/ACE/ace/Cleanup.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Condition_T.inl b/ACE/ace/Condition_T.inl
index fd7bdb7abdc..dc426622988 100644
--- a/ACE/ace/Condition_T.inl
+++ b/ACE/ace/Condition_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<class MUTEX> ACE_INLINE int
diff --git a/ACE/ace/Configuration.inl b/ACE/ace/Configuration.inl
index b7c9af26f5c..ebd6d6f9e5a 100644
--- a/ACE/ace/Configuration.inl
+++ b/ACE/ace/Configuration.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_TCHAR*
diff --git a/ACE/ace/Containers.inl b/ACE/ace/Containers.inl
index 01b7a243891..cd7507d403b 100644
--- a/ACE/ace/Containers.inl
+++ b/ACE/ace/Containers.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Containers_T.inl b/ACE/ace/Containers_T.inl
index 425d6e167e8..adc0f42cd23 100644
--- a/ACE/ace/Containers_T.inl
+++ b/ACE/ace/Containers_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T> ACE_INLINE int
diff --git a/ACE/ace/Countdown_Time_T.inl b/ACE/ace/Countdown_Time_T.inl
index 79abe9670d7..319729d9c37 100644
--- a/ACE/ace/Countdown_Time_T.inl
+++ b/ACE/ace/Countdown_Time_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename TIME_POLICY> ACE_INLINE bool
diff --git a/ACE/ace/DEV.inl b/ACE/ace/DEV.inl
index e00f4fc705e..ee0bb783898 100644
--- a/ACE/ace/DEV.inl
+++ b/ACE/ace/DEV.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/DEV_Addr.inl b/ACE/ace/DEV_Addr.inl
index 820b961d1d0..3025745f2c0 100644
--- a/ACE/ace/DEV_Addr.inl
+++ b/ACE/ace/DEV_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/Global_Macros.h"
#include "ace/os_include/sys/os_socket.h"
diff --git a/ACE/ace/DEV_Connector.inl b/ACE/ace/DEV_Connector.inl
index 51a674be98c..b92b4d2a5a3 100644
--- a/ACE/ace/DEV_Connector.inl
+++ b/ACE/ace/DEV_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Creates a Local ACE_DEV.
diff --git a/ACE/ace/DEV_IO.inl b/ACE/ace/DEV_IO.inl
index cb9392e2bf3..45e4a097078 100644
--- a/ACE/ace/DEV_IO.inl
+++ b/ACE/ace/DEV_IO.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_uio.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_Memory.h"
diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl
index dfb0d239bc3..196f572befd 100644
--- a/ACE/ace/Date_Time.inl
+++ b/ACE/ace/Date_Time.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/Time_Value.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl
index 190a21abdd0..3e420f1cc71 100644
--- a/ACE/ace/Dirent.inl
+++ b/ACE/ace/Dirent.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Log_Category.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Dirent_Selector.inl b/ACE/ace/Dirent_Selector.inl
index 7c42f46b9be..27651569b7d 100644
--- a/ACE/ace/Dirent_Selector.inl
+++ b/ACE/ace/Dirent_Selector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/Dump_T.cpp b/ACE/ace/Dump_T.cpp
index 3c789497eee..fc0833a9e39 100644
--- a/ACE/ace/Dump_T.cpp
+++ b/ACE/ace/Dump_T.cpp
@@ -1,7 +1,4 @@
// Dump_T.cpp
-//
-// $Id$
-
#ifndef ACE_DUMP_T_CPP
#define ACE_DUMP_T_CPP
diff --git a/ACE/ace/Dynamic.inl b/ACE/ace/Dynamic.inl
index 3f506bc51f4..795f33d2ec3 100644
--- a/ACE/ace/Dynamic.inl
+++ b/ACE/ace/Dynamic.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Dynamic_Message_Strategy.inl b/ACE/ace/Dynamic_Message_Strategy.inl
index b855acef597..675e0f1e491 100644
--- a/ACE/ace/Dynamic_Message_Strategy.inl
+++ b/ACE/ace/Dynamic_Message_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE unsigned long
diff --git a/ACE/ace/Dynamic_Service.inl b/ACE/ace/Dynamic_Service.inl
index f818cf09411..5ae958d8ff5 100644
--- a/ACE/ace/Dynamic_Service.inl
+++ b/ACE/ace/Dynamic_Service.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_USES_WCHAR)
diff --git a/ACE/ace/Event_Handler.inl b/ACE/ace/Event_Handler.inl
index 75f2cd12aa5..4ad5d2d26b2 100644
--- a/ACE/ace/Event_Handler.inl
+++ b/ACE/ace/Event_Handler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp
index 3911da07853..51efca89136 100644
--- a/ACE/ace/Event_Handler_T.cpp
+++ b/ACE/ace/Event_Handler_T.cpp
@@ -1,7 +1,4 @@
// Event_Handler_T.cpp
-//
-// $Id$
-
#ifndef ACE_EVENT_HANDLER_T_CPP
#define ACE_EVENT_HANDLER_T_CPP
diff --git a/ACE/ace/FIFO.inl b/ACE/ace/FIFO.inl
index 149ed11318b..9fe5c733e3c 100644
--- a/ACE/ace/FIFO.inl
+++ b/ACE/ace/FIFO.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/FIFO_Recv.inl b/ACE/ace/FIFO_Recv.inl
index b5cf96cb56d..aa95234c573 100644
--- a/ACE/ace/FIFO_Recv.inl
+++ b/ACE/ace/FIFO_Recv.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/ace/FIFO_Recv_Msg.inl b/ACE/ace/FIFO_Recv_Msg.inl
index f1fc7e3f8f7..917aee9df34 100644
--- a/ACE/ace/FIFO_Recv_Msg.inl
+++ b/ACE/ace/FIFO_Recv_Msg.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Min_Max.h"
#include "ace/OS_NS_stropts.h"
#include "ace/Truncate.h"
diff --git a/ACE/ace/FIFO_Send.inl b/ACE/ace/FIFO_Send.inl
index 12491058e2c..ee0d8d0b537 100644
--- a/ACE/ace/FIFO_Send.inl
+++ b/ACE/ace/FIFO_Send.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/ace/FIFO_Send_Msg.inl b/ACE/ace/FIFO_Send_Msg.inl
index 74392656597..74aaa197193 100644
--- a/ACE/ace/FIFO_Send_Msg.inl
+++ b/ACE/ace/FIFO_Send_Msg.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_stropts.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/FILE.inl b/ACE/ace/FILE.inl
index fdd65029d3a..69c3e0cd231 100644
--- a/ACE/ace/FILE.inl
+++ b/ACE/ace/FILE.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/FILE_Addr.inl b/ACE/ace/FILE_Addr.inl
index e03cd2ab156..c873ba8b08b 100644
--- a/ACE/ace/FILE_Addr.inl
+++ b/ACE/ace/FILE_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SString.h"
diff --git a/ACE/ace/FILE_Connector.inl b/ACE/ace/FILE_Connector.inl
index 0cf91293ba8..a12a6573bc0 100644
--- a/ACE/ace/FILE_Connector.inl
+++ b/ACE/ace/FILE_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Creates a Local ACE_FILE.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/FILE_IO.inl b/ACE/ace/FILE_IO.inl
index 7db33a0c717..57c300490ee 100644
--- a/ACE/ace/FILE_IO.inl
+++ b/ACE/ace/FILE_IO.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_sys_uio.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/ace/File_Lock.inl b/ACE/ace/File_Lock.inl
index 46ac7015903..fb9ae6e0c10 100644
--- a/ACE/ace/File_Lock.inl
+++ b/ACE/ace/File_Lock.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/Flag_Manip.inl b/ACE/ace/Flag_Manip.inl
index da24f2a1282..f6def7748f3 100644
--- a/ACE/ace/Flag_Manip.inl
+++ b/ACE/ace/Flag_Manip.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_fcntl.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Functor_String.inl b/ACE/ace/Functor_String.inl
index 34eedd8613d..d6f427f4a70 100644
--- a/ACE/ace/Functor_String.inl
+++ b/ACE/ace/Functor_String.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/String_Base.h"
diff --git a/ACE/ace/Functor_T.inl b/ACE/ace/Functor_T.inl
index f22672d7fa5..415a0090b42 100644
--- a/ACE/ace/Functor_T.inl
+++ b/ACE/ace/Functor_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<class RECEIVER> ACE_INLINE
diff --git a/ACE/ace/Handle_Gobbler.inl b/ACE/ace/Handle_Gobbler.inl
index 2646da9ed6c..8bacb005ded 100644
--- a/ACE/ace/Handle_Gobbler.inl
+++ b/ACE/ace/Handle_Gobbler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Since this is only included in Handle_Gobbler.h, these should be
// inline, not ACE_INLINE.
// FUZZ: disable check_for_inline
diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl
index 2ab6e34b9e2..c234bd79aa5 100644
--- a/ACE/ace/Handle_Set.inl
+++ b/ACE/ace/Handle_Set.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Log_Category.h"
// AIX defines bzero() in this odd file... used by FD_ZERO
diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl
index a4ff4d0a5a9..c112e3d5432 100644
--- a/ACE/ace/Hash_Map_Manager_T.inl
+++ b/ACE/ace/Hash_Map_Manager_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.inl b/ACE/ace/Hash_Multi_Map_Manager_T.inl
index 355d75f121a..0fc32da55b0 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.inl
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 76a33694ef5..6cc14c97558 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/IOStream_T.inl b/ACE/ace/IOStream_T.inl
index 12cf0fcffbf..1797de613df 100644
--- a/ACE/ace/IOStream_T.inl
+++ b/ACE/ace/IOStream_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Handle_Set.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_sys_select.h"
diff --git a/ACE/ace/IPC_SAP.inl b/ACE/ace/IPC_SAP.inl
index 0adcb6e9b09..8419609148e 100644
--- a/ACE/ace/IPC_SAP.inl
+++ b/ACE/ace/IPC_SAP.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_stropts.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Intrusive_Auto_Ptr.inl b/ACE/ace/Intrusive_Auto_Ptr.inl
index d366cb75926..bca5495cd1b 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.inl
+++ b/ACE/ace/Intrusive_Auto_Ptr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
#include "ace/Log_Category.h"
diff --git a/ACE/ace/Intrusive_List.inl b/ACE/ace/Intrusive_List.inl
index ce38cfd0186..17d7a15653e 100644
--- a/ACE/ace/Intrusive_List.inl
+++ b/ACE/ace/Intrusive_List.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include <algorithm>
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Intrusive_List_Node.inl b/ACE/ace/Intrusive_List_Node.inl
index 0672be2f345..220453adc46 100644
--- a/ACE/ace/Intrusive_List_Node.inl
+++ b/ACE/ace/Intrusive_List_Node.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<class T> ACE_INLINE T*
diff --git a/ACE/ace/LSOCK.inl b/ACE/ace/LSOCK.inl
index 5dbbb0626a1..9815783f323 100644
--- a/ACE/ace/LSOCK.inl
+++ b/ACE/ace/LSOCK.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Simple-minded constructor.
diff --git a/ACE/ace/LSOCK_CODgram.inl b/ACE/ace/LSOCK_CODgram.inl
index d27ee2fd881..1ebcf344bb2 100644
--- a/ACE/ace/LSOCK_CODgram.inl
+++ b/ACE/ace/LSOCK_CODgram.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Do nothing constructor.
diff --git a/ACE/ace/LSOCK_Connector.inl b/ACE/ace/LSOCK_Connector.inl
index f9cdffbf6dc..fa519c21558 100644
--- a/ACE/ace/LSOCK_Connector.inl
+++ b/ACE/ace/LSOCK_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Establish a connection.
diff --git a/ACE/ace/LSOCK_Dgram.inl b/ACE/ace/LSOCK_Dgram.inl
index 2c29136e06d..6028a3586c2 100644
--- a/ACE/ace/LSOCK_Dgram.inl
+++ b/ACE/ace/LSOCK_Dgram.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/ACE/ace/LSOCK_Stream.inl b/ACE/ace/LSOCK_Stream.inl
index bf7e45b376d..16b9489153e 100644
--- a/ACE/ace/LSOCK_Stream.inl
+++ b/ACE/ace/LSOCK_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Sets both the file descriptors... Overrides handle from the base
diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl
index 9c2449d01cc..23dc5d86796 100644
--- a/ACE/ace/Local_Tokens.inl
+++ b/ACE/ace/Local_Tokens.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_TOKENS_LIBRARY)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Lock.inl b/ACE/ace/Lock.inl
index 7e4842a0e33..43b4bac0898 100644
--- a/ACE/ace/Lock.inl
+++ b/ACE/ace/Lock.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Lock_Adapter_T.inl b/ACE/ace/Lock_Adapter_T.inl
index 99ccf5c8e32..5de19ea5b2f 100644
--- a/ACE/ace/Lock_Adapter_T.inl
+++ b/ACE/ace/Lock_Adapter_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_Memory.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Log_Category.inl b/ACE/ace/Log_Category.inl
index 7649da7f3b8..8fac70ac0da 100644
--- a/ACE/ace/Log_Category.inl
+++ b/ACE/ace/Log_Category.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE unsigned int
diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl
index 5594d83ecce..ca9ea538767 100644
--- a/ACE/ace/Log_Record.inl
+++ b/ACE/ace/Log_Record.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/os_include/arpa/os_inet.h"
#include "ace/Time_Value.h"
diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl
index 5f85e5de1bf..77e7b9b37d8 100644
--- a/ACE/ace/MEM_Acceptor.inl
+++ b/ACE/ace/MEM_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/MEM_Addr.inl b/ACE/ace/MEM_Addr.inl
index ca2c0de2089..f51d16154a0 100644
--- a/ACE/ace/MEM_Addr.inl
+++ b/ACE/ace/MEM_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/MEM_Connector.inl b/ACE/ace/MEM_Connector.inl
index 76bd05ba7d7..ca7a601f11e 100644
--- a/ACE/ace/MEM_Connector.inl
+++ b/ACE/ace/MEM_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Establish a connection.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/MEM_IO.inl b/ACE/ace/MEM_IO.inl
index 0abaf6d4af4..0599660bc78 100644
--- a/ACE/ace/MEM_IO.inl
+++ b/ACE/ace/MEM_IO.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/Truncate.h"
diff --git a/ACE/ace/MEM_SAP.inl b/ACE/ace/MEM_SAP.inl
index 3c2a4eb9d9a..87c6f9133f0 100644
--- a/ACE/ace/MEM_SAP.inl
+++ b/ACE/ace/MEM_SAP.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/RW_Thread_Mutex.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/MEM_Stream.inl b/ACE/ace/MEM_Stream.inl
index 20b60415896..d268c45a749 100644
--- a/ACE/ace/MEM_Stream.inl
+++ b/ACE/ace/MEM_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/MEM_Stream.h"
#include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/ace/MMAP_Memory_Pool.inl b/ACE/ace/MMAP_Memory_Pool.inl
index db3f5a7ba0f..bc494c4312d 100644
--- a/ACE/ace/MMAP_Memory_Pool.inl
+++ b/ACE/ace/MMAP_Memory_Pool.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Malloc.inl b/ACE/ace/Malloc.inl
index fdfbd1a612d..2eb2a3a2325 100644
--- a/ACE/ace/Malloc.inl
+++ b/ACE/ace/Malloc.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Malloc_Allocator.inl b/ACE/ace/Malloc_Allocator.inl
index 87a96099c1a..bb1fcffc0c1 100644
--- a/ACE/ace/Malloc_Allocator.inl
+++ b/ACE/ace/Malloc_Allocator.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl
index d83669c57fe..55ee851d7ea 100644
--- a/ACE/ace/Malloc_T.inl
+++ b/ACE/ace/Malloc_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Managed_Object.inl b/ACE/ace/Managed_Object.inl
index 0619691d8a6..4747e8faa2b 100644
--- a/ACE/ace/Managed_Object.inl
+++ b/ACE/ace/Managed_Object.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE>
diff --git a/ACE/ace/Manual_Event.inl b/ACE/ace/Manual_Event.inl
index ccfd875e793..d72fdfc85e6 100644
--- a/ACE/ace/Manual_Event.inl
+++ b/ACE/ace/Manual_Event.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TIME_POLICY>
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index 230a9621b43..3c132b4f9bf 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
#include "ace/Log_Category.h"
diff --git a/ACE/ace/Map_T.inl b/ACE/ace/Map_T.inl
index 1abeae0f759..1e4ae9b8173 100644
--- a/ACE/ace/Map_T.inl
+++ b/ACE/ace/Map_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T> ACE_INLINE int
diff --git a/ACE/ace/Mem_Map.inl b/ACE/ace/Mem_Map.inl
index 4fd43d4f3de..0d9994ce811 100644
--- a/ACE/ace/Mem_Map.inl
+++ b/ACE/ace/Mem_Map.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_sys_mman.h"
#include "ace/OS_NS_sys_stat.h"
diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl
index 89d615582a4..1bc636fbd7a 100644
--- a/ACE/ace/Message_Block.inl
+++ b/ACE/ace/Message_Block.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_Data_Block *
diff --git a/ACE/ace/Message_Block_T.inl b/ACE/ace/Message_Block_T.inl
index 6829bd6c360..cdc1b73872f 100644
--- a/ACE/ace/Message_Block_T.inl
+++ b/ACE/ace/Message_Block_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<class ACE_LOCK> ACE_INLINE
diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl
index aaadea9d3e6..31f420e4c20 100644
--- a/ACE/ace/Message_Queue.inl
+++ b/ACE/ace/Message_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Message_Queue_NT.inl b/ACE/ace/Message_Queue_NT.inl
index 6db82111d5b..7c1b2851503 100644
--- a/ACE/ace/Message_Queue_NT.inl
+++ b/ACE/ace/Message_Queue_NT.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
# include "ace/Guard_T.h"
#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/ace/Message_Queue_Vx.inl b/ACE/ace/Message_Queue_Vx.inl
index 19e865d2832..fe79a760ac2 100644
--- a/ACE/ace/Message_Queue_Vx.inl
+++ b/ACE/ace/Message_Queue_Vx.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_VXWORKS)
diff --git a/ACE/ace/Metrics_Cache_T.inl b/ACE/ace/Metrics_Cache_T.inl
index 2ed23200cb8..5b2e1a77153 100644
--- a/ACE/ace/Metrics_Cache_T.inl
+++ b/ACE/ace/Metrics_Cache_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ACE_METRICS_CACHE_T_INL
#define ACE_METRICS_CACHE_T_INL
diff --git a/ACE/ace/Module.inl b/ACE/ace/Module.inl
index 22bcd6a5468..43f9dba762c 100644
--- a/ACE/ace/Module.inl
+++ b/ACE/ace/Module.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Monotonic_Time_Policy.inl b/ACE/ace/Monotonic_Time_Policy.inl
index 67626e5556d..bef06a049da 100644
--- a/ACE/ace/Monotonic_Time_Policy.inl
+++ b/ACE/ace/Monotonic_Time_Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "ace/High_Res_Timer.h"
diff --git a/ACE/ace/Msg_WFMO_Reactor.inl b/ACE/ace/Msg_WFMO_Reactor.inl
index be021dc58a5..ee73e611812 100644
--- a/ACE/ace/Msg_WFMO_Reactor.inl
+++ b/ACE/ace/Msg_WFMO_Reactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Multihomed_INET_Addr.inl b/ACE/ace/Multihomed_INET_Addr.inl
index 50f67c01191..0dbad837588 100644
--- a/ACE/ace/Multihomed_INET_Addr.inl
+++ b/ACE/ace/Multihomed_INET_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Accessor implementations
diff --git a/ACE/ace/Mutex.inl b/ACE/ace/Mutex.inl
index 97ebf851da5..632172dd006 100644
--- a/ACE/ace/Mutex.inl
+++ b/ACE/ace/Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_mman.h"
diff --git a/ACE/ace/NT_Service.inl b/ACE/ace/NT_Service.inl
index bd9b7ea5b63..9808ce8f7b9 100644
--- a/ACE/ace/NT_Service.inl
+++ b/ACE/ace/NT_Service.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl
index 2fe5e6c54e2..9fd2af39b92 100644
--- a/ACE/ace/OS_Errno.inl
+++ b/ACE/ace/OS_Errno.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/OS_Log_Msg_Attributes.inl b/ACE/ace/OS_Log_Msg_Attributes.inl
index e44d1b08a27..222609f53d8 100644
--- a/ACE/ace/OS_Log_Msg_Attributes.inl
+++ b/ACE/ace/OS_Log_Msg_Attributes.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 3d12371ae96..d9ea1e086b4 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_macros.h"
// for timespec_t, perhaps move it to os_time.h
#include "ace/Time_Value.h"
diff --git a/ACE/ace/OS_NS_ctype.inl b/ACE/ace/OS_NS_ctype.inl
index 977ce001ad5..73d9529be41 100644
--- a/ACE/ace/OS_NS_ctype.inl
+++ b/ACE/ace/OS_NS_ctype.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_LACKS_ISCTYPE)
#include "ace/OS_NS_errno.h"
#endif
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index b32b98ac87a..6e31c21a13e 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_Memory.h"
#if defined (ACE_LACKS_ALPHASORT)
diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl
index 521df796647..2147def7fea 100644
--- a/ACE/ace/OS_NS_dlfcn.inl
+++ b/ACE/ace/OS_NS_dlfcn.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_macros.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_fcntl.h"
diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl
index 3465bd4f504..cad5d49789b 100644
--- a/ACE/ace/OS_NS_errno.inl
+++ b/ACE/ace/OS_NS_errno.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-all.h" /* Need ACE_TRACE */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_fcntl.inl b/ACE/ace/OS_NS_fcntl.inl
index 6714b0fe389..afb95c68428 100644
--- a/ACE/ace/OS_NS_fcntl.inl
+++ b/ACE/ace/OS_NS_fcntl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl
index dc17a38d76a..a8426aee9c8 100644
--- a/ACE/ace/OS_NS_netdb.inl
+++ b/ACE/ace/OS_NS_netdb.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_macros.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/OS_NS_poll.inl b/ACE/ace/OS_NS_poll.inl
index ab1b2d8b54e..511c71948c3 100644
--- a/ACE/ace/OS_NS_poll.inl
+++ b/ACE/ace/OS_NS_poll.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Time_Value.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index d72a09039a3..c724114d8fc 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 97da2ad3584..e9a2170c5e7 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_fcntl.h"
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 91b39046ea8..5417a04170c 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-all.h" /* Need ACE_TRACE */
#include "ace/Object_Manager_Base.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index 734e90e1aa2..23119a68aac 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// OS_NS_wchar.h is only needed to get the emulation methods.
// Perhaps they should be moved. dhinton
#include "ace/OS_NS_wchar.h"
diff --git a/ACE/ace/OS_NS_strings.inl b/ACE/ace/OS_NS_strings.inl
index 2b2012b2f38..780eff09daf 100644
--- a/ACE/ace/OS_NS_strings.inl
+++ b/ACE/ace/OS_NS_strings.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_WCHAR)
# include "ace/OS_NS_wchar.h"
#endif /* ACE_HAS_WCHAR */
diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl
index e6feea48f1d..21c5d096f6d 100644
--- a/ACE/ace/OS_NS_stropts.inl
+++ b/ACE/ace/OS_NS_stropts.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/os_include/os_errno.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index b1ec3d034b2..538e60fd921 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_fcntl.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_stdio.h"
diff --git a/ACE/ace/OS_NS_sys_msg.inl b/ACE/ace/OS_NS_sys_msg.inl
index 129b4c389c1..92b7a646e19 100644
--- a/ACE/ace/OS_NS_sys_msg.inl
+++ b/ACE/ace/OS_NS_sys_msg.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl
index 510923300a8..e49119d3e32 100644
--- a/ACE/ace/OS_NS_sys_resource.inl
+++ b/ACE/ace/OS_NS_sys_resource.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_macros.h"
diff --git a/ACE/ace/OS_NS_sys_select.inl b/ACE/ace/OS_NS_sys_select.inl
index 7c75b476ccc..396ffe729ca 100644
--- a/ACE/ace/OS_NS_sys_select.inl
+++ b/ACE/ace/OS_NS_sys_select.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_macros.h"
#include "ace/Time_Value.h"
diff --git a/ACE/ace/OS_NS_sys_sendfile.inl b/ACE/ace/OS_NS_sys_sendfile.inl
index d79186017be..3be63e7d9b5 100644
--- a/ACE/ace/OS_NS_sys_sendfile.inl
+++ b/ACE/ace/OS_NS_sys_sendfile.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 1
# include <sys/sendfile.h>
#endif /* ACE_HAS_SENDFILE==1 */
diff --git a/ACE/ace/OS_NS_sys_shm.inl b/ACE/ace/OS_NS_sys_shm.inl
index ef7fef59847..02c3b9221f5 100644
--- a/ACE/ace/OS_NS_sys_shm.inl
+++ b/ACE/ace/OS_NS_sys_shm.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index 0f769cd7cb5..491d8987897 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_fcntl.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl
index 0067c079b39..ac9dfb5f10a 100644
--- a/ACE/ace/OS_NS_sys_time.inl
+++ b/ACE/ace/OS_NS_sys_time.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/os_include/sys/os_time.h"
#include "ace/os_include/os_errno.h"
diff --git a/ACE/ace/OS_NS_sys_uio.inl b/ACE/ace/OS_NS_sys_uio.inl
index b8d112bba84..d31e7034e0f 100644
--- a/ACE/ace/OS_NS_sys_uio.inl
+++ b/ACE/ace/OS_NS_sys_uio.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/os_include/os_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl
index 02ecc734717..ddb4adfa125 100644
--- a/ACE/ace/OS_NS_sys_wait.inl
+++ b/ACE/ace/OS_NS_sys_wait.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 8b16b056ae6..be68f3babad 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h"
#include "ace/Time_Value.h"
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index bdc05b320df..6bcc6f72547 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_utsname.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/OS_NS_wchar.inl b/ACE/ace/OS_NS_wchar.inl
index 7f2abac8d8f..0b11e61e303 100644
--- a/ACE/ace/OS_NS_wchar.inl
+++ b/ACE/ace/OS_NS_wchar.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_HAS_WCHAR)
diff --git a/ACE/ace/OS_TLI.inl b/ACE/ace/OS_TLI.inl
index 4dffee0f96f..7104344cac6 100644
--- a/ACE/ace/OS_TLI.inl
+++ b/ACE/ace/OS_TLI.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Obchunk.inl b/ACE/ace/Obchunk.inl
index 4853b0e12aa..b27a8abef07 100644
--- a/ACE/ace/Obchunk.inl
+++ b/ACE/ace/Obchunk.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Object_Manager.inl b/ACE/ace/Object_Manager.inl
index bcff772f605..a65098a6fa0 100644
--- a/ACE/ace/Object_Manager.inl
+++ b/ACE/ace/Object_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/PI_Malloc.inl b/ACE/ace/PI_Malloc.inl
index 1cb78d466e1..98cdca3ae03 100644
--- a/ACE/ace/PI_Malloc.inl
+++ b/ACE/ace/PI_Malloc.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/POSIX_Proactor.inl b/ACE/ace/POSIX_Proactor.inl
index ae5f727c2a8..c6edd4a5ca8 100644
--- a/ACE/ace/POSIX_Proactor.inl
+++ b/ACE/ace/POSIX_Proactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl
index 6fd4cf0e8b1..30003e0b1e7 100644
--- a/ACE/ace/Pagefile_Memory_Pool.inl
+++ b/ACE/ace/Pagefile_Memory_Pool.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Pair_T.inl b/ACE/ace/Pair_T.inl
index cfb2cd35d04..a8f620350f6 100644
--- a/ACE/ace/Pair_T.inl
+++ b/ACE/ace/Pair_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T1, class T2> ACE_INLINE
diff --git a/ACE/ace/Ping_Socket.inl b/ACE/ace/Ping_Socket.inl
index c331b21cea7..b6fcf0be113 100644
--- a/ACE/ace/Ping_Socket.inl
+++ b/ACE/ace/Ping_Socket.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE char *
diff --git a/ACE/ace/Pipe.inl b/ACE/ace/Pipe.inl
index 20f929c2ad6..85900d2d6ed 100644
--- a/ACE/ace/Pipe.inl
+++ b/ACE/ace/Pipe.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/ACE.h"
diff --git a/ACE/ace/Proactor.inl b/ACE/ace/Proactor.inl
index 37b887c14d6..c5027092b04 100644
--- a/ACE/ace/Proactor.inl
+++ b/ACE/ace/Proactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index 3c5189836ff..1bccc246778 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_sys_wait.h"
#include "ace/OS_NS_signal.h"
diff --git a/ACE/ace/Process_Manager.inl b/ACE/ace/Process_Manager.inl
index 248acd4c8e0..33d2c034be7 100644
--- a/ACE/ace/Process_Manager.inl
+++ b/ACE/ace/Process_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE size_t
diff --git a/ACE/ace/Process_Mutex.inl b/ACE/ace/Process_Mutex.inl
index 6c19e8d6757..57dc044d933 100644
--- a/ACE/ace/Process_Mutex.inl
+++ b/ACE/ace/Process_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if !defined (_ACE_USE_SV_SEM)
diff --git a/ACE/ace/Process_Semaphore.inl b/ACE/ace/Process_Semaphore.inl
index e51d0890665..d19eb2286ba 100644
--- a/ACE/ace/Process_Semaphore.inl
+++ b/ACE/ace/Process_Semaphore.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)
diff --git a/ACE/ace/Profile_Timer.inl b/ACE/ace/Profile_Timer.inl
index 6ef5aa45af3..3b52d41954f 100644
--- a/ACE/ace/Profile_Timer.inl
+++ b/ACE/ace/Profile_Timer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_sys_resource.h"
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/QoS/QoS_Session_Impl.inl b/ACE/ace/QoS/QoS_Session_Impl.inl
index 3f58fcc433f..37000bdde31 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.inl
+++ b/ACE/ace/QoS/QoS_Session_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
#if defined (ACE_HAS_RAPI)
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
index 9e2347669c5..e3cad2380f9 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl
index fbeb19c3e98..dcebea5e71a 100644
--- a/ACE/ace/RB_Tree.inl
+++ b/ACE/ace/RB_Tree.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
#include "ace/Malloc_Base.h"
#include "ace/Log_Category.h"
diff --git a/ACE/ace/RW_Mutex.inl b/ACE/ace/RW_Mutex.inl
index 947bb409744..3939b8c23fd 100644
--- a/ACE/ace/RW_Mutex.inl
+++ b/ACE/ace/RW_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_rwlock_t &
diff --git a/ACE/ace/RW_Process_Mutex.inl b/ACE/ace/RW_Process_Mutex.inl
index e3bced0449c..61326713aba 100644
--- a/ACE/ace/RW_Process_Mutex.inl
+++ b/ACE/ace/RW_Process_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Explicitly destroy the mutex.
diff --git a/ACE/ace/RW_Thread_Mutex.inl b/ACE/ace/RW_Thread_Mutex.inl
index 9f4d315df4a..a69c8b597c0 100644
--- a/ACE/ace/RW_Thread_Mutex.inl
+++ b/ACE/ace/RW_Thread_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/Reactor.inl b/ACE/ace/Reactor.inl
index 499f625ee61..5d2bc60cfff 100644
--- a/ACE/ace/Reactor.inl
+++ b/ACE/ace/Reactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Reactor_Impl.h"
/*
diff --git a/ACE/ace/Reactor_Notification_Strategy.inl b/ACE/ace/Reactor_Notification_Strategy.inl
index 328c2687a77..92a472cee94 100644
--- a/ACE/ace/Reactor_Notification_Strategy.inl
+++ b/ACE/ace/Reactor_Notification_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_Reactor *
diff --git a/ACE/ace/Read_Buffer.inl b/ACE/ace/Read_Buffer.inl
index 1517e9c17e3..cadd0077464 100644
--- a/ACE/ace/Read_Buffer.inl
+++ b/ACE/ace/Read_Buffer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Accessor to the number of bytes in the buffer.
diff --git a/ACE/ace/Recursive_Thread_Mutex.inl b/ACE/ace/Recursive_Thread_Mutex.inl
index 6a7b55dc6a2..739e7756930 100644
--- a/ACE/ace/Recursive_Thread_Mutex.inl
+++ b/ACE/ace/Recursive_Thread_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_recursive_thread_mutex_t &
diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl
index 7ee81683aed..f495076b153 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.inl
+++ b/ACE/ace/Refcounted_Auto_Ptr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
#include "ace/Log_Category.h"
diff --git a/ACE/ace/Remote_Tokens.inl b/ACE/ace/Remote_Tokens.inl
index 50487075225..84f8e3691ff 100644
--- a/ACE/ace/Remote_Tokens.inl
+++ b/ACE/ace/Remote_Tokens.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_TOKENS_LIBRARY)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Reverse_Lock_T.inl b/ACE/ace/Reverse_Lock_T.inl
index 0f8598ffd23..21d4d9705bf 100644
--- a/ACE/ace/Reverse_Lock_T.inl
+++ b/ACE/ace/Reverse_Lock_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-all.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/SOCK.inl b/ACE/ace/SOCK.inl
index c57fa36dfec..74875bd41c3 100644
--- a/ACE/ace/SOCK.inl
+++ b/ACE/ace/SOCK.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_socket.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK_Acceptor.inl b/ACE/ace/SOCK_Acceptor.inl
index a4456ed3ab6..bf6822a3e0f 100644
--- a/ACE/ace/SOCK_Acceptor.inl
+++ b/ACE/ace/SOCK_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SOCK_CODgram.inl b/ACE/ace/SOCK_CODgram.inl
index de7b0570973..28f4faf936a 100644
--- a/ACE/ace/SOCK_CODgram.inl
+++ b/ACE/ace/SOCK_CODgram.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SOCK_Connector.inl b/ACE/ace/SOCK_Connector.inl
index c4862d0ea75..ff1c7031182 100644
--- a/ACE/ace/SOCK_Connector.inl
+++ b/ACE/ace/SOCK_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// This constructor is used by a client when it wants to connect to
diff --git a/ACE/ace/SOCK_Dgram.inl b/ACE/ace/SOCK_Dgram.inl
index 2bcdfef7c3e..b2a116c31b9 100644
--- a/ACE/ace/SOCK_Dgram.inl
+++ b/ACE/ace/SOCK_Dgram.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// SOCK_Dgram.i
#include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/ace/SOCK_Dgram_Bcast.inl b/ACE/ace/SOCK_Dgram_Bcast.inl
index 00bb342be5e..429afa82e60 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.inl
+++ b/ACE/ace/SOCK_Dgram_Bcast.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_socket.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK_Dgram_Mcast.inl b/ACE/ace/SOCK_Dgram_Mcast.inl
index e7b380abf95..d7920012689 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.inl
+++ b/ACE/ace/SOCK_Dgram_Mcast.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl
index 0721c33fd0d..eec644cd71f 100644
--- a/ACE/ace/SOCK_IO.inl
+++ b/ACE/ace/SOCK_IO.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_unistd.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.inl b/ACE/ace/SOCK_SEQPACK_Acceptor.inl
index 0a0b591d75f..82577e26651 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.inl
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SOCK_SEQPACK_Association.inl b/ACE/ace/SOCK_SEQPACK_Association.inl
index a156a946257..98e59c6f421 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.inl
+++ b/ACE/ace/SOCK_SEQPACK_Association.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SOCK_SEQPACK_Association.h"
#include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/ace/SOCK_SEQPACK_Connector.inl b/ACE/ace/SOCK_SEQPACK_Connector.inl
index 93704f89d9e..1b04fe27409 100644
--- a/ACE/ace/SOCK_SEQPACK_Connector.inl
+++ b/ACE/ace/SOCK_SEQPACK_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// This constructor is used by a client when it wants to connect to
diff --git a/ACE/ace/SOCK_Stream.inl b/ACE/ace/SOCK_Stream.inl
index ed5e8b231b8..fe25fdde36e 100644
--- a/ACE/ace/SOCK_Stream.inl
+++ b/ACE/ace/SOCK_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SOCK_Stream.h"
#include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/ace/SPIPE.inl b/ACE/ace/SPIPE.inl
index 45814117a51..5303fbdeaf6 100644
--- a/ACE/ace/SPIPE.inl
+++ b/ACE/ace/SPIPE.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/SPIPE_Addr.inl b/ACE/ace/SPIPE_Addr.inl
index ea4c71ef682..b92aed80916 100644
--- a/ACE/ace/SPIPE_Addr.inl
+++ b/ACE/ace/SPIPE_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SString.h"
diff --git a/ACE/ace/SPIPE_Connector.inl b/ACE/ace/SPIPE_Connector.inl
index 1d41abe08d4..e31bf17a2e1 100644
--- a/ACE/ace/SPIPE_Connector.inl
+++ b/ACE/ace/SPIPE_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/ACE/ace/SPIPE_Stream.inl b/ACE/ace/SPIPE_Stream.inl
index 3807dc86906..08b9071b2fa 100644
--- a/ACE/ace/SPIPE_Stream.inl
+++ b/ACE/ace/SPIPE_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_uio.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.inl b/ACE/ace/SSL/SSL_Asynch_Stream.inl
index 1fe5cc2ae9d..969a37cd37b 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.inl
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE SSL *
diff --git a/ACE/ace/SSL/SSL_Context.inl b/ACE/ace/SSL/SSL_Context.inl
index 09825777c65..d7ccb88d7ee 100644
--- a/ACE/ace/SSL/SSL_Context.inl
+++ b/ACE/ace/SSL/SSL_Context.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SSL/SSL_SOCK.inl b/ACE/ace/SSL/SSL_SOCK.inl
index 1a39d5214dc..6a12914d844 100644
--- a/ACE/ace/SSL/SSL_SOCK.inl
+++ b/ACE/ace/SSL/SSL_SOCK.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_socket.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
index 3cc1e04f9ac..d790662af29 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "SSL_SOCK_Acceptor.h"
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
index fbbfaf2ccda..c02845b22d8 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp
index 67e8f3d15e2..45df4ef0404 100644
--- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "SSL_SOCK_Connector.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.inl b/ACE/ace/SSL/SSL_SOCK_Connector.inl
index 831425b5ab3..0dd4bb62e36 100644
--- a/ACE/ace/SSL/SSL_SOCK_Connector.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl
index 239a44bc16e..10ab1c2ffa0 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_errno.h"
#include "ace/Truncate.h"
diff --git a/ACE/ace/SSL/ssl_for_tao.mpc b/ACE/ace/SSL/ssl_for_tao.mpc
index a51906d068f..c89b8c0d5aa 100644
--- a/ACE/ace/SSL/ssl_for_tao.mpc
+++ b/ACE/ace/SSL/ssl_for_tao.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(SSL_FOR_TAO) : acelib, ace_output, install, ace_openssl {
requires += ssl ace_for_tao
sharedname = ACE_SSL_FOR_TAO
diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl
index 8aae9df08a8..be539758e78 100644
--- a/ACE/ace/SString.inl
+++ b/ACE/ace/SString.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Include ACE.h only if it hasn't already been included, e.g., if
// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by
// String_Base.cpp.
diff --git a/ACE/ace/SV_Message.inl b/ACE/ace/SV_Message.inl
index 3f698bd5071..ef4265ba689 100644
--- a/ACE/ace/SV_Message.inl
+++ b/ACE/ace/SV_Message.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/config-all.h"
diff --git a/ACE/ace/SV_Message_Queue.inl b/ACE/ace/SV_Message_Queue.inl
index a8cd134776c..f1355d51c61 100644
--- a/ACE/ace/SV_Message_Queue.inl
+++ b/ACE/ace/SV_Message_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/OS_NS_sys_msg.h"
diff --git a/ACE/ace/SV_Semaphore_Complex.inl b/ACE/ace/SV_Semaphore_Complex.inl
index 8b80748ebf5..184bd2d64df 100644
--- a/ACE/ace/SV_Semaphore_Complex.inl
+++ b/ACE/ace/SV_Semaphore_Complex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/SV_Semaphore_Simple.inl b/ACE/ace/SV_Semaphore_Simple.inl
index 5dde75ffff6..fc91a85c746 100644
--- a/ACE/ace/SV_Semaphore_Simple.inl
+++ b/ACE/ace/SV_Semaphore_Simple.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
#include "ace/OS_NS_Thread.h"
diff --git a/ACE/ace/SV_Shared_Memory.inl b/ACE/ace/SV_Shared_Memory.inl
index 8ca16d52e47..19235c3ffee 100644
--- a/ACE/ace/SV_Shared_Memory.inl
+++ b/ACE/ace/SV_Shared_Memory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_shm.h"
#include "ace/Global_Macros.h"
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl
index 6b283d38287..3993e9ff75e 100644
--- a/ACE/ace/Select_Reactor_Base.inl
+++ b/ACE/ace/Select_Reactor_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Reactor.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl
index 21112d0aeb9..be6192c55da 100644
--- a/ACE/ace/Select_Reactor_T.inl
+++ b/ACE/ace/Select_Reactor_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Reactor.h"
#include "ace/Signal.h"
#include "ace/Sig_Handler.h"
diff --git a/ACE/ace/Semaphore.inl b/ACE/ace/Semaphore.inl
index 238117585ac..8de0beef334 100644
--- a/ACE/ace/Semaphore.inl
+++ b/ACE/ace/Semaphore.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_sema_t &
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl
index b31f910dc6a..5cffe43449f 100644
--- a/ACE/ace/Service_Config.inl
+++ b/ACE/ace/Service_Config.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index 873a930ceab..ec46b27060a 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Service_Repository.inl b/ACE/ace/Service_Repository.inl
index 056534a4a55..dbe09731f92 100644
--- a/ACE/ace/Service_Repository.inl
+++ b/ACE/ace/Service_Repository.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Returns a count of the number of currently valid entries (counting
// both resumed and suspended entries).
diff --git a/ACE/ace/Service_Types.inl b/ACE/ace/Service_Types.inl
index 02b2d3c6c41..cb13c1c4ec4 100644
--- a/ACE/ace/Service_Types.inl
+++ b/ACE/ace/Service_Types.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/ACE.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Shared_Memory_MM.inl b/ACE/ace/Shared_Memory_MM.inl
index 4f6890d9270..75762c1994d 100644
--- a/ACE/ace/Shared_Memory_MM.inl
+++ b/ACE/ace/Shared_Memory_MM.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Return the name of file that is mapped (if any).
diff --git a/ACE/ace/Shared_Memory_SV.inl b/ACE/ace/Shared_Memory_SV.inl
index 71f417f8848..ae7fbc6e263 100644
--- a/ACE/ace/Shared_Memory_SV.inl
+++ b/ACE/ace/Shared_Memory_SV.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Shared_Object.inl b/ACE/ace/Shared_Object.inl
index cd76cb6a267..358a3fb7a4e 100644
--- a/ACE/ace/Shared_Object.inl
+++ b/ACE/ace/Shared_Object.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Sig_Handler.inl b/ACE/ace/Sig_Handler.inl
index 89427780d98..a2ad69de737 100644
--- a/ACE/ace/Sig_Handler.inl
+++ b/ACE/ace/Sig_Handler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_INLINE
ACE_Sig_Handler::ACE_Sig_Handler (void)
{
diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl
index 5740a6e2b60..ff2f52403ec 100644
--- a/ACE/ace/Signal.inl
+++ b/ACE/ace/Signal.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_signal.h"
#include "ace/config-all.h"
#include "ace/Trace.h"
diff --git a/ACE/ace/Singleton.inl b/ACE/ace/Singleton.inl
index 4351a59a5f6..912271ba20f 100644
--- a/ACE/ace/Singleton.inl
+++ b/ACE/ace/Singleton.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Default constructors.
diff --git a/ACE/ace/Stats.inl b/ACE/ace/Stats.inl
index d6c9d1a1715..2e54c1228ef 100644
--- a/ACE/ace/Stats.inl
+++ b/ACE/ace/Stats.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Strategies_T.inl b/ACE/ace/Strategies_T.inl
index 4529f8b0d0c..ef16da28447 100644
--- a/ACE/ace/Strategies_T.inl
+++ b/ACE/ace/Strategies_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class SVC_HANDLER> ACE_INLINE
diff --git a/ACE/ace/Stream.inl b/ACE/ace/Stream.inl
index c46e33922e7..ac9754924c3 100644
--- a/ACE/ace/Stream.inl
+++ b/ACE/ace/Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *
diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl
index 29c262e2b56..9e397d2d186 100644
--- a/ACE/ace/String_Base.inl
+++ b/ACE/ace/String_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Malloc_Base.h"
#include "ace/Min_Max.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/ace/TLI_Connector.inl b/ACE/ace/TLI_Connector.inl
index c6273ab38aa..eac9d9a5848 100644
--- a/ACE/ace/TLI_Connector.inl
+++ b/ACE/ace/TLI_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/TLI_Stream.inl b/ACE/ace/TLI_Stream.inl
index 8ef7265f8cd..8f5608f0a1d 100644
--- a/ACE/ace/TLI_Stream.inl
+++ b/ACE/ace/TLI_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/TLI_Stream.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl
index 33f3fbe2a4c..f793fd23c6e 100644
--- a/ACE/ace/TP_Reactor.inl
+++ b/ACE/ace/TP_Reactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/************************************************************************/
diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl
index 0775b72c01b..7e68976c88d 100644
--- a/ACE/ace/TSS_T.inl
+++ b/ACE/ace/TSS_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Thread.h"
#include "ace/Log_Category.h"
diff --git a/ACE/ace/Task.inl b/ACE/ace/Task.inl
index 713e457bb16..2d585d13b27 100644
--- a/ACE/ace/Task.inl
+++ b/ACE/ace/Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Get the current group id.
diff --git a/ACE/ace/Task_Ex_T.inl b/ACE/ace/Task_Ex_T.inl
index 87d4f18fbe6..a5132305649 100644
--- a/ACE/ace/Task_Ex_T.inl
+++ b/ACE/ace/Task_Ex_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> ACE_INLINE void
diff --git a/ACE/ace/Task_T.inl b/ACE/ace/Task_T.inl
index 7b20baea3ae..ee73c57d076 100644
--- a/ACE/ace/Task_T.inl
+++ b/ACE/ace/Task_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void
diff --git a/ACE/ace/Thread.inl b/ACE/ace/Thread.inl
index 3501393a5eb..33f7fcf0b73 100644
--- a/ACE/ace/Thread.inl
+++ b/ACE/ace/Thread.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Thread_Adapter.inl b/ACE/ace/Thread_Adapter.inl
index 4f1fa0fce49..06751eecd9a 100644
--- a/ACE/ace/Thread_Adapter.inl
+++ b/ACE/ace/Thread_Adapter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_Thread_Manager *
diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl
index 7d2d75ec01c..e3ddda3a897 100644
--- a/ACE/ace/Thread_Manager.inl
+++ b/ACE/ace/Thread_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Thread_Mutex.inl b/ACE/ace/Thread_Mutex.inl
index 5eba0696c4b..e3d2719327e 100644
--- a/ACE/ace/Thread_Mutex.inl
+++ b/ACE/ace/Thread_Mutex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_thread_mutex_t &
diff --git a/ACE/ace/Thread_Semaphore.inl b/ACE/ace/Thread_Semaphore.inl
index e9535ff088e..9a2a0affed3 100644
--- a/ACE/ace/Thread_Semaphore.inl
+++ b/ACE/ace/Thread_Semaphore.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl
index 1ff177dc005..59650b8e159 100644
--- a/ACE/ace/Time_Policy.inl
+++ b/ACE/ace/Time_Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "ace/High_Res_Timer.h"
diff --git a/ACE/ace/Time_Policy_T.inl b/ACE/ace/Time_Policy_T.inl
index 3aec79fe737..25a5ea07927 100644
--- a/ACE/ace/Time_Policy_T.inl
+++ b/ACE/ace/Time_Policy_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename TIME_POLICY>
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl
index e9db8764fa3..eaed073f45d 100644
--- a/ACE/ace/Time_Value.inl
+++ b/ACE/ace/Time_Value.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Truncate.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Time_Value_T.inl b/ACE/ace/Time_Value_T.inl
index b5470c13494..934bebf228c 100644
--- a/ACE/ace/Time_Value_T.inl
+++ b/ACE/ace/Time_Value_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TIME_POLICY>
diff --git a/ACE/ace/Timeprobe.inl b/ACE/ace/Timeprobe.inl
index d25eb4b0cfa..216f4372469 100644
--- a/ACE/ace/Timeprobe.inl
+++ b/ACE/ace/Timeprobe.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/ACE/ace/Timer_Queue_Adapters.inl b/ACE/ace/Timer_Queue_Adapters.inl
index ad160682566..ad5129f73fd 100644
--- a/ACE/ace/Timer_Queue_Adapters.inl
+++ b/ACE/ace/Timer_Queue_Adapters.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template<class TQ, class TYPE> ACE_INLINE TQ *
diff --git a/ACE/ace/Timer_Queue_Iterator.inl b/ACE/ace/Timer_Queue_Iterator.inl
index 353f98cf128..556987e08ac 100644
--- a/ACE/ace/Timer_Queue_Iterator.inl
+++ b/ACE/ace/Timer_Queue_Iterator.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE> ACE_INLINE void
diff --git a/ACE/ace/Timer_Queue_T.inl b/ACE/ace/Timer_Queue_T.inl
index a98177a6623..64f2bf14c5a 100644
--- a/ACE/ace/Timer_Queue_T.inl
+++ b/ACE/ace/Timer_Queue_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE, class FUNCTOR> ACE_INLINE FUNCTOR &
diff --git a/ACE/ace/Token.inl b/ACE/ace/Token.inl
index d375789fbd1..5d42c427bdf 100644
--- a/ACE/ace/Token.inl
+++ b/ACE/ace/Token.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-macros.h"
#if defined (ACE_HAS_THREADS)
diff --git a/ACE/ace/Token_Collection.inl b/ACE/ace/Token_Collection.inl
index db86701a325..1104b1f6030 100644
--- a/ACE/ace/Token_Collection.inl
+++ b/ACE/ace/Token_Collection.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_TOKENS_LIBRARY)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Token_Manager.inl b/ACE/ace/Token_Manager.inl
index b779b57b9de..0bbbfc67d67 100644
--- a/ACE/ace/Token_Manager.inl
+++ b/ACE/ace/Token_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_TOKENS_LIBRARY)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Token_Request_Reply.inl b/ACE/ace/Token_Request_Reply.inl
index 36688fb8d63..df58781c5f2 100644
--- a/ACE/ace/Token_Request_Reply.inl
+++ b/ACE/ace/Token_Request_Reply.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (ACE_HAS_TOKENS_LIBRARY)
#include "ace/Truncate.h"
diff --git a/ACE/ace/Typed_SV_Message.inl b/ACE/ace/Typed_SV_Message.inl
index 00ff07109ac..2e3c12939c3 100644
--- a/ACE/ace/Typed_SV_Message.inl
+++ b/ACE/ace/Typed_SV_Message.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-all.h"
#include "ace/Global_Macros.h"
diff --git a/ACE/ace/Typed_SV_Message_Queue.inl b/ACE/ace/Typed_SV_Message_Queue.inl
index 21ae9536501..915bd371713 100644
--- a/ACE/ace/Typed_SV_Message_Queue.inl
+++ b/ACE/ace/Typed_SV_Message_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SV_Message_Queue.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/UNIX_Addr.inl b/ACE/ace/UNIX_Addr.inl
index 48f9fd123ab..f19ef68a52b 100644
--- a/ACE/ace/UNIX_Addr.inl
+++ b/ACE/ace/UNIX_Addr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
diff --git a/ACE/ace/UPIPE_Acceptor.inl b/ACE/ace/UPIPE_Acceptor.inl
index 731d6be4a6c..37af88b4ad4 100644
--- a/ACE/ace/UPIPE_Acceptor.inl
+++ b/ACE/ace/UPIPE_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/ACE/ace/UPIPE_Connector.inl b/ACE/ace/UPIPE_Connector.inl
index f298000d2a0..cbb55a4864d 100644
--- a/ACE/ace/UPIPE_Connector.inl
+++ b/ACE/ace/UPIPE_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Creates a Local ACE_UPIPE.
diff --git a/ACE/ace/UPIPE_Stream.inl b/ACE/ace/UPIPE_Stream.inl
index 3a33d287b0b..acc4a4ed789 100644
--- a/ACE/ace/UPIPE_Stream.inl
+++ b/ACE/ace/UPIPE_Stream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_HANDLE
diff --git a/ACE/ace/Unbounded_Queue.inl b/ACE/ace/Unbounded_Queue.inl
index b7d814e9780..b3e76ad999d 100644
--- a/ACE/ace/Unbounded_Queue.inl
+++ b/ACE/ace/Unbounded_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T> ACE_INLINE size_t
diff --git a/ACE/ace/Unbounded_Set.inl b/ACE/ace/Unbounded_Set.inl
index a7266f2802d..d1372f24319 100644
--- a/ACE/ace/Unbounded_Set.inl
+++ b/ACE/ace/Unbounded_Set.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Unbounded_Set_Ex.inl b/ACE/ace/Unbounded_Set_Ex.inl
index 136de2b5e5a..bbb8772d6fc 100644
--- a/ACE/ace/Unbounded_Set_Ex.inl
+++ b/ACE/ace/Unbounded_Set_Ex.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Global_Macros.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl
index e49441641f2..81382438534 100644
--- a/ACE/ace/Vector_T.inl
+++ b/ACE/ace/Vector_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include <algorithm>
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl
index eb81e727a5f..19c7da594d6 100644
--- a/ACE/ace/WFMO_Reactor.inl
+++ b/ACE/ace/WFMO_Reactor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Handle_Set.h"
#include "ace/Reactor.h"
#include "ace/Thread.h"
diff --git a/ACE/ace/XTI_ATM_Mcast.inl b/ACE/ace/XTI_ATM_Mcast.inl
index 1c7a6d4ed09..c8dddef6675 100644
--- a/ACE/ace/XTI_ATM_Mcast.inl
+++ b/ACE/ace/XTI_ATM_Mcast.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index dc26263e96b..648049892b5 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
// The ACE_FOR_TAO subset is designed primarily for use with the
// TAO CosNotification service. It is not intended to be used
// for some of other TAO features and services, such as the TAO
diff --git a/ACE/ace/ace_wchar.cpp b/ACE/ace/ace_wchar.cpp
index 381e2d4fb0e..515efd1a362 100644
--- a/ACE/ace/ace_wchar.cpp
+++ b/ACE/ace/ace_wchar.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/config-macros.h"
#include "ace/ace_wchar.h"
diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl
index 86182f9ec0e..d11fd9bca57 100644
--- a/ACE/ace/ace_wchar.inl
+++ b/ACE/ace/ace_wchar.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// These are always inlined
// FUZZ: disable check_for_inline
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index ba79fc13a28..e024997f42c 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// This configuration file is designed to be included by another,
// specific configuration file. It provides config information common
// to all g++ platforms, including egcs.
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index e152342494f..4bf08172167 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ACE_LINUX_ICC_COMMON_H
#define ACE_LINUX_ICC_COMMON_H
#include /**/ "ace/pre.h"
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 438c9f5cd04..b3b2f0c05f3 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// The following configuration file is designed to work for Linux
// platforms using GNU C++.
diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h
index 6c72d03dd24..86677fb64f5 100644
--- a/ACE/ace/config-suncc-common.h
+++ b/ACE/ace/config-suncc-common.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ACE_SUNCC_COMMON_H
#define ACE_SUNCC_COMMON_H
#include /**/ "ace/pre.h"
diff --git a/ACE/apps/JAWS/clients/Caching/Local_Locator.inl b/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
index 0ef8e595f86..6ff6cb3ccd9 100644
--- a/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
+++ b/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_INLINE
ACE_URL_Record::ACE_URL_Record (void)
: id_ (0),
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
index c8fdd65ac25..6489cd94b69 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_INLINE size_t
ACE_WString_Helper::size (const ACE_WString &wstr)
{
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.h b/ACE/apps/JAWS3/jaws3/Concurrency.h
index 2f8b8a18873..7009bbacc5d 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef JAWS_CONCURRENCY_H
#define JAWS_CONCURRENCY_H
diff --git a/ACE/apps/JAWS3/jaws3/FILE.h b/ACE/apps/JAWS3/jaws3/FILE.h
index be2bea9e291..d7ff3d58749 100644
--- a/ACE/apps/JAWS3/jaws3/FILE.h
+++ b/ACE/apps/JAWS3/jaws3/FILE.h
@@ -1,7 +1,4 @@
// -*- c++ -*-
-//
-// $Id$
-
#ifndef JAWS_FILE_H
#define JAWS_FILE_H
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index b02fd84fa0b..04a9558ae77 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -20,3 +20,8 @@ BEGIN{undef $/;} s/ \*\n \* \$Id\$\n \*\n/ \*\n/smg;
BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n\/\/\n\n//smg;
# Replace a three line c-style id tag with nothing
BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n\/\/\n//smg;
+# Replace a two line c-style id tag with an empty line below that with nothing
+BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n\n//smg;
+# Replace a two line c-style id tag with nothing
+BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n//smg;
+
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index 39c115b8c46..d8dc8df002d 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/* Handles INET broadcast datagram messages from remote hosts on the local subnet. */
#ifndef _HANDLE_BROADCAST_H
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index fcd51a43a1a..fb1adbc5132 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/* Handle connections from local UNIX ACE_FIFO */
/* Read from a well known ACE_FIFO and write to stdout. */
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
index 50c0456893f..964754090c5 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/SPIPE_Stream.h"
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index fb06f525073..8b3cd811bf5 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/* Handle connections from remote INET connections. */
#ifndef _HANDLE_R_STREAM_H
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index e07cc247ca9..f9be20a305c 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/* Handles timeouts. */
#ifndef _HANDLE_TIMEOUT_H
diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.h b/ACE/examples/Service_Configurator/Misc/Timer_Service.h
index 01aa77b7317..148278f396d 100644
--- a/ACE/examples/Service_Configurator/Misc/Timer_Service.h
+++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/svc_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ACE/netsvcs/clients/Naming/Client/Client_Test.h b/ACE/netsvcs/clients/Naming/Client/Client_Test.h
index d9017c13cab..8332e06b8da 100644
--- a/ACE/netsvcs/clients/Naming/Client/Client_Test.h
+++ b/ACE/netsvcs/clients/Naming/Client/Client_Test.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Event_Handler.h"
#include "ace/Naming_Context.h"
diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
index 41d74115930..b833a6bf29f 100644
--- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
+++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Event_Handler.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
index f56e8001e76..77e8207091a 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ACE_PERFORMANCE_TEST_H
#define ACE_PERFORMANCE_TEST_H
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.inl b/ACE/protocols/ace/HTBP/HTBP_Channel.inl
index c6281dc0a8f..0807c14dd96 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.inl
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Filter.inl
index c648393daa4..d188aedf5f8 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.inl
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
index e8b08950ce6..f673a835318 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
index e0659ae5e13..57a2c48af68 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.inl b/ACE/protocols/ace/HTBP/HTBP_Session.inl
index aee8cbf4dc3..5cee38b71fc 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.inl
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/ACE/protocols/ace/INet/AuthenticationBase.inl b/ACE/protocols/ace/INet/AuthenticationBase.inl
index bc6c98f7c43..4f6c4a1ad98 100644
--- a/ACE/protocols/ace/INet/AuthenticationBase.inl
+++ b/ACE/protocols/ace/INet/AuthenticationBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.inl b/ACE/protocols/ace/INet/ClientRequestHandler.inl
index 930ac77ef3c..cf6e5ad60f5 100644
--- a/ACE/protocols/ace/INet/ClientRequestHandler.inl
+++ b/ACE/protocols/ace/INet/ClientRequestHandler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/ConnectionCache.inl b/ACE/protocols/ace/INet/ConnectionCache.inl
index 1f276e49dde..73d66d2ce42 100644
--- a/ACE/protocols/ace/INet/ConnectionCache.inl
+++ b/ACE/protocols/ace/INet/ConnectionCache.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.inl b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.inl
index efaca8aadae..4eb77159a03 100644
--- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.inl
+++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/FTP_IOStream.inl b/ACE/protocols/ace/INet/FTP_IOStream.inl
index d365c3eaeed..876cd7cfdd0 100644
--- a/ACE/protocols/ace/INet/FTP_IOStream.inl
+++ b/ACE/protocols/ace/INet/FTP_IOStream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/FTP_Request.inl b/ACE/protocols/ace/INet/FTP_Request.inl
index 605ca36280a..ff11d29a97c 100644
--- a/ACE/protocols/ace/INet/FTP_Request.inl
+++ b/ACE/protocols/ace/INet/FTP_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/FTP_Response.inl b/ACE/protocols/ace/INet/FTP_Response.inl
index 7e8c5a3048d..64115cefdb5 100644
--- a/ACE/protocols/ace/INet/FTP_Response.inl
+++ b/ACE/protocols/ace/INet/FTP_Response.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/FTP_URL.inl b/ACE/protocols/ace/INet/FTP_URL.inl
index 0a5cd7fb23d..f04d4724bfa 100644
--- a/ACE/protocols/ace/INet/FTP_URL.inl
+++ b/ACE/protocols/ace/INet/FTP_URL.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTPS_Context.inl b/ACE/protocols/ace/INet/HTTPS_Context.inl
index d4aaee7e8c8..16d07bac2bc 100644
--- a/ACE/protocols/ace/INet/HTTPS_Context.inl
+++ b/ACE/protocols/ace/INet/HTTPS_Context.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTPS_URL.inl b/ACE/protocols/ace/INet/HTTPS_URL.inl
index 4502825a57c..3c63508f070 100644
--- a/ACE/protocols/ace/INet/HTTPS_URL.inl
+++ b/ACE/protocols/ace/INet/HTTPS_URL.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.inl b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.inl
index 56b7a2fbcba..1b88dfc2bf7 100644
--- a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.inl
+++ b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.inl b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.inl
index 3e023ecd6e7..25ad61afb90 100644
--- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.inl
+++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_Header.inl b/ACE/protocols/ace/INet/HTTP_Header.inl
index 2895ef048c6..f186f8a524a 100644
--- a/ACE/protocols/ace/INet/HTTP_Header.inl
+++ b/ACE/protocols/ace/INet/HTTP_Header.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.inl b/ACE/protocols/ace/INet/HTTP_IOStream.inl
index 96b0a83a438..a6fd8b3861a 100644
--- a/ACE/protocols/ace/INet/HTTP_IOStream.inl
+++ b/ACE/protocols/ace/INet/HTTP_IOStream.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_Request.inl b/ACE/protocols/ace/INet/HTTP_Request.inl
index e1aff7cedf5..fd6d5b1a75d 100644
--- a/ACE/protocols/ace/INet/HTTP_Request.inl
+++ b/ACE/protocols/ace/INet/HTTP_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_Response.inl b/ACE/protocols/ace/INet/HTTP_Response.inl
index 891e9a332d8..59968d529ec 100644
--- a/ACE/protocols/ace/INet/HTTP_Response.inl
+++ b/ACE/protocols/ace/INet/HTTP_Response.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_SessionBase.inl b/ACE/protocols/ace/INet/HTTP_SessionBase.inl
index 6539f51b284..4735e22290e 100644
--- a/ACE/protocols/ace/INet/HTTP_SessionBase.inl
+++ b/ACE/protocols/ace/INet/HTTP_SessionBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_Status.inl b/ACE/protocols/ace/INet/HTTP_Status.inl
index 1d62ca0f342..3f1054e5ed7 100644
--- a/ACE/protocols/ace/INet/HTTP_Status.inl
+++ b/ACE/protocols/ace/INet/HTTP_Status.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HTTP_URL.inl b/ACE/protocols/ace/INet/HTTP_URL.inl
index 398f4dc7c8d..bd5b6d7f19c 100644
--- a/ACE/protocols/ace/INet/HTTP_URL.inl
+++ b/ACE/protocols/ace/INet/HTTP_URL.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/HeaderBase.inl b/ACE/protocols/ace/INet/HeaderBase.inl
index a6661081b48..3a0f57f17bd 100644
--- a/ACE/protocols/ace/INet/HeaderBase.inl
+++ b/ACE/protocols/ace/INet/HeaderBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.inl b/ACE/protocols/ace/INet/SSL_CallbackManager.inl
index 3728957c3f6..41b22e1cf84 100644
--- a/ACE/protocols/ace/INet/SSL_CallbackManager.inl
+++ b/ACE/protocols/ace/INet/SSL_CallbackManager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.inl b/ACE/protocols/ace/INet/SSL_CertificateCallback.inl
index 614db4394ac..4fb0974cb33 100644
--- a/ACE/protocols/ace/INet/SSL_CertificateCallback.inl
+++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/SSL_X509Cert.inl b/ACE/protocols/ace/INet/SSL_X509Cert.inl
index 0c0c0f8a88c..d0b7905b0c4 100644
--- a/ACE/protocols/ace/INet/SSL_X509Cert.inl
+++ b/ACE/protocols/ace/INet/SSL_X509Cert.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/ace/INet/URLBase.inl b/ACE/protocols/ace/INet/URLBase.inl
index c998e47a3f7..8d8121a08cc 100644
--- a/ACE/protocols/ace/INet/URLBase.inl
+++ b/ACE/protocols/ace/INet/URLBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc b/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
index 61e59146a93..b95fac7767c 100755
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*Server): aceexe, htbp {
exename = server
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc b/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
index 61e59146a93..b95fac7767c 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*Server): aceexe, htbp {
exename = server
diff --git a/ACE/protocols/tests/HTBP/ping/ping.mpc b/ACE/protocols/tests/HTBP/ping/ping.mpc
index 61e59146a93..b95fac7767c 100755
--- a/ACE/protocols/tests/HTBP/ping/ping.mpc
+++ b/ACE/protocols/tests/HTBP/ping/ping.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*Server): aceexe, htbp {
exename = server