summaryrefslogtreecommitdiff
path: root/ACE/apps
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
commitc88815f2039e7152d735c18650c102df84d9aa36 (patch)
treea703b59c98e6739970c4f3b51396c2284c9ce12b /ACE/apps
parent0fbdabcd0a8970712cbbdef06465d061a4ec13c4 (diff)
downloadATCD-c88815f2039e7152d735c18650c102df84d9aa36.tar.gz
Removed single line Id tag
Diffstat (limited to 'ACE/apps')
-rw-r--r--ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Config_Files.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Connection_Handler.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Event_Channel.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/File_Parser.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Gateway.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/Options.cpp2
-rw-r--r--ACE/apps/Gateway/Gateway/gateway.mpc2
-rw-r--r--ACE/apps/Gateway/Peer/Options.cpp2
-rw-r--r--ACE/apps/Gateway/Peer/Peer.cpp2
-rw-r--r--ACE/apps/Gateway/Peer/peer.mpc2
-rw-r--r--ACE/apps/JAWS/clients/Blobby/Blob.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Blobby/Options.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Blobby/blobby.mpc2
-rw-r--r--ACE/apps/JAWS/clients/Caching/ID_Generator.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/Local_Locator.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl2
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Locator.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Properties.cpp2
-rw-r--r--ACE/apps/JAWS/clients/Caching/caching.mpc2
-rw-r--r--ACE/apps/JAWS/clients/Caching/test_URL.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Config.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Handler.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Helpers.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Request.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Response.cpp2
-rw-r--r--ACE/apps/JAWS/server/HTTP_Server.cpp2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Concurrency.h2
-rw-r--r--ACE/apps/JAWS/server/JAWS_IO.cpp2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Pipeline.cpp2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Pipeline.h2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp2
-rw-r--r--ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h2
-rw-r--r--ACE/apps/JAWS/server/Parse_Headers.cpp2
-rw-r--r--ACE/apps/JAWS/server/main.cpp2
-rw-r--r--ACE/apps/JAWS/server/server.mpc2
-rw-r--r--ACE/apps/JAWS/stress_testing/benchd.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/client.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/connection.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/connection.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/cp.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/cp.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/global.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/http.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/http_tester.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/stats.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/stats.h2
-rw-r--r--ACE/apps/JAWS/stress_testing/util.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/util.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_base.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_base.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_base.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_export.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_headers.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_headers.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_headers.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_request.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_request.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_request.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_response.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_response.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_response.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_status.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_status.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_status.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/httpu.mpc2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_request.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_request.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_request.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_response.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_response.h2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_http_response.inl2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_url.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTPU/parse_url.h2
-rw-r--r--ACE/apps/JAWS2/HTTP_10.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_10.h2
-rw-r--r--ACE/apps/JAWS2/HTTP_10_Parse.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_10_Read.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_10_Request.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_10_Request.h2
-rw-r--r--ACE/apps/JAWS2/HTTP_10_Write.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_Policy.cpp2
-rw-r--r--ACE/apps/JAWS2/HTTP_Policy.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Assoc_Array.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Assoc_Array.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Hash_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Heap_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_List_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_List_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Manager.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Manager.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Manager_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Object.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Object.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Concurrency.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Data_Block.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Data_Block.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Export.h1
-rw-r--r--ACE/apps/JAWS2/JAWS/FILE.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/FILE.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Filecache.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Filecache.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Headers.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/IO_Acceptor.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/IO_Handler.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Jaws_IO.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Parse_Headers.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Parse_Headers.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Policy.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Policy.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Reaper.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Reaper.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Server.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Server.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/Waiter.cpp2
-rw-r--r--ACE/apps/JAWS2/JAWS/Waiter.h2
-rw-r--r--ACE/apps/JAWS2/JAWS/jaws2.mpc2
-rw-r--r--ACE/apps/JAWS2/main.cpp2
-rw-r--r--ACE/apps/JAWS3/bench/average.cpp2
-rw-r--r--ACE/apps/JAWS3/bench/mkfiles.cpp2
-rw-r--r--ACE/apps/JAWS3/bench/rqfiles.cpp2
-rw-r--r--ACE/apps/JAWS3/http/HTTP_Data.h2
-rw-r--r--ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp2
-rw-r--r--ACE/apps/JAWS3/http/HTTP_Service_Handler.h2
-rw-r--r--ACE/apps/JAWS3/http/HTTP_States.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Asynch_IO.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Asynch_IO.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Concurrency_T.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Concurrency_T.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Config_File.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Config_File.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Datagram.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Datagram.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Event_Completer.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Event_Completer.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Event_Dispatcher.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Event_Result.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Export.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/FILE.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Jaws_IO.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Jaws_IO.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Options.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Options.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Protocol_Handler.h1
-rw-r--r--ACE/apps/JAWS3/jaws3/Reactive_IO.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Reactive_IO.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Signal_Task.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Signal_Task.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Symbol_Table.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Symbol_Table.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Synch_IO.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Synch_IO.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/TPR_Concurrency.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Task_Timer.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Task_Timer.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Templates.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Timer.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Timer.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp2
-rw-r--r--ACE/apps/JAWS3/jaws3/Timer_Helpers.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/jaws3.mpc2
-rw-r--r--ACE/apps/JAWS3/jaws3/main.cpp1
-rw-r--r--ACE/apps/JAWS3/small/SS_Data.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_Data.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_Service_Handler.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_Service_Handler.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_DONE.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_DONE.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_ERROR.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_ERROR.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_PARSE.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_PARSE.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_READ.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_READ.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_WRITE.cpp2
-rw-r--r--ACE/apps/JAWS3/small/SS_State_WRITE.h2
-rw-r--r--ACE/apps/JAWS3/small/SS_Templates.cpp2
-rw-r--r--ACE/apps/drwho/BS_Client.cpp2
-rw-r--r--ACE/apps/drwho/BS_Server.cpp2
-rw-r--r--ACE/apps/drwho/Binary_Search.cpp2
-rw-r--r--ACE/apps/drwho/CM_Client.cpp2
-rw-r--r--ACE/apps/drwho/CM_Server.cpp2
-rw-r--r--ACE/apps/drwho/Comm_Manager.cpp2
-rw-r--r--ACE/apps/drwho/Drwho_Node.cpp2
-rw-r--r--ACE/apps/drwho/File_Manager.cpp2
-rw-r--r--ACE/apps/drwho/HT_Client.cpp2
-rw-r--r--ACE/apps/drwho/HT_Server.cpp2
-rw-r--r--ACE/apps/drwho/Hash_Table.cpp2
-rw-r--r--ACE/apps/drwho/Multicast_Manager.cpp2
-rw-r--r--ACE/apps/drwho/Options.cpp2
-rw-r--r--ACE/apps/drwho/PMC_All.cpp2
-rw-r--r--ACE/apps/drwho/PMC_Flo.cpp2
-rw-r--r--ACE/apps/drwho/PMC_Ruser.cpp2
-rw-r--r--ACE/apps/drwho/PMC_Usr.cpp2
-rw-r--r--ACE/apps/drwho/PMS_All.cpp2
-rw-r--r--ACE/apps/drwho/PMS_Flo.cpp2
-rw-r--r--ACE/apps/drwho/PMS_Ruser.cpp2
-rw-r--r--ACE/apps/drwho/PMS_Usr.cpp2
-rw-r--r--ACE/apps/drwho/PM_Client.cpp2
-rw-r--r--ACE/apps/drwho/PM_Server.cpp2
-rw-r--r--ACE/apps/drwho/Protocol_Manager.cpp2
-rw-r--r--ACE/apps/drwho/Protocol_Record.cpp2
-rw-r--r--ACE/apps/drwho/Rwho_DB_Manager.cpp1
-rw-r--r--ACE/apps/drwho/SL_Client.cpp2
-rw-r--r--ACE/apps/drwho/SL_Server.cpp2
-rw-r--r--ACE/apps/drwho/SML_Client.cpp2
-rw-r--r--ACE/apps/drwho/SML_Server.cpp2
-rw-r--r--ACE/apps/drwho/SMR_Client.cpp2
-rw-r--r--ACE/apps/drwho/SMR_Server.cpp2
-rw-r--r--ACE/apps/drwho/SM_Client.cpp2
-rw-r--r--ACE/apps/drwho/SM_Server.cpp2
-rw-r--r--ACE/apps/drwho/Search_Struct.cpp2
-rw-r--r--ACE/apps/drwho/Select_Manager.cpp2
-rw-r--r--ACE/apps/drwho/Single_Lookup.cpp2
-rw-r--r--ACE/apps/drwho/drwho.mpc2
-rw-r--r--ACE/apps/gperf/ace_gperf.mpc2
-rw-r--r--ACE/apps/gperf/src/gperf.mpc2
-rw-r--r--ACE/apps/gperf/tests/test.cpp2
-rw-r--r--ACE/apps/gperf/tests/tests.mpc2
-rw-r--r--ACE/apps/mkcsregdb/mkcsregdb.mpc2
-rw-r--r--ACE/apps/soreduce/Library.cpp2
-rw-r--r--ACE/apps/soreduce/Library.h2
-rw-r--r--ACE/apps/soreduce/Obj_Module.cpp2
-rw-r--r--ACE/apps/soreduce/Obj_Module.h2
-rw-r--r--ACE/apps/soreduce/SO_Group.cpp2
-rw-r--r--ACE/apps/soreduce/SO_Group.h2
-rw-r--r--ACE/apps/soreduce/Sig_List.cpp2
-rw-r--r--ACE/apps/soreduce/Sig_List.h2
-rw-r--r--ACE/apps/soreduce/Signature.cpp2
-rw-r--r--ACE/apps/soreduce/Signature.h2
-rw-r--r--ACE/apps/soreduce/soreduce.cpp2
-rw-r--r--ACE/apps/soreduce/soreduce.mpc2
264 files changed, 0 insertions, 524 deletions
diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
index 0a51bff6d36..feb3342d188 100644
--- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
+++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/apps/Gateway/Gateway/Config_Files.cpp b/ACE/apps/Gateway/Gateway/Config_Files.cpp
index 7fffdda63bf..ac453aae243 100644
--- a/ACE/apps/Gateway/Gateway/Config_Files.cpp
+++ b/ACE/apps/Gateway/Gateway/Config_Files.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "Config_Files.h"
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
index f26174ab3a8..93db8296a3b 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
index 2bcfc759a1e..535e325a80d 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "Event_Channel.h"
diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
index 95add312bcb..d140392fbd3 100644
--- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
+++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Connection_Handler_Connector.h"
#include "ace/os_include/os_netdb.h"
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
index 64c5d3918de..34255b3fde2 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "Connection_Handler_Connector.h"
diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
index a22cde73637..56c60f9b1c6 100644
--- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (_CONSUMER_MAP_C)
#define _CONSUMER_MAP_C
diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp
index 1feea67c291..d301b408efc 100644
--- a/ACE/apps/Gateway/Gateway/File_Parser.cpp
+++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FILE_PARSER_C
#define FILE_PARSER_C
diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp
index b91c8026143..a443ccde4df 100644
--- a/ACE/apps/Gateway/Gateway/Gateway.cpp
+++ b/ACE/apps/Gateway/Gateway/Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/OS_NS_stdio.h"
diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp
index 8ecbf2e820c..2d0f618c97c 100644
--- a/ACE/apps/Gateway/Gateway/Options.cpp
+++ b/ACE/apps/Gateway/Gateway/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "Event.h"
diff --git a/ACE/apps/Gateway/Gateway/gateway.mpc b/ACE/apps/Gateway/Gateway/gateway.mpc
index 2f201ba3bc7..7f00528a5fb 100644
--- a/ACE/apps/Gateway/Gateway/gateway.mpc
+++ b/ACE/apps/Gateway/Gateway/gateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Gateway) : acelib, ace_output {
sharedname = Gateway
Source_Files {
diff --git a/ACE/apps/Gateway/Peer/Options.cpp b/ACE/apps/Gateway/Peer/Options.cpp
index 1e140fab125..4b8f8dcc7f8 100644
--- a/ACE/apps/Gateway/Peer/Options.cpp
+++ b/ACE/apps/Gateway/Peer/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/Get_Opt.h"
diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp
index 76dbe01e63b..469cc06a8fb 100644
--- a/ACE/apps/Gateway/Peer/Peer.cpp
+++ b/ACE/apps/Gateway/Peer/Peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/OS_NS_stdio.h"
diff --git a/ACE/apps/Gateway/Peer/peer.mpc b/ACE/apps/Gateway/Peer/peer.mpc
index 498e422f626..d2e6a0476c1 100644
--- a/ACE/apps/Gateway/Peer/peer.mpc
+++ b/ACE/apps/Gateway/Peer/peer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Gateway_Peer) : ace_output, acelib {
sharedname = Gateway_Peer
Source_Files {
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.cpp b/ACE/apps/JAWS/clients/Blobby/Blob.cpp
index b28d2601142..0b33cf9bc68 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Blob.h"
#include "Blob_Handler.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 8bc5bc28785..4d6e617024c 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Blob_Handler.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/JAWS/clients/Blobby/Options.cpp b/ACE/apps/JAWS/clients/Blobby/Options.cpp
index 986c438db4b..bd2e95b90f0 100644
--- a/ACE/apps/JAWS/clients/Blobby/Options.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "Blob.h"
diff --git a/ACE/apps/JAWS/clients/Blobby/blobby.mpc b/ACE/apps/JAWS/clients/Blobby/blobby.mpc
index 40bcf1bbe65..8cc5446394a 100644
--- a/ACE/apps/JAWS/clients/Blobby/blobby.mpc
+++ b/ACE/apps/JAWS/clients/Blobby/blobby.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(blobby) : aceexe {
exename = blobby
Source_Files {
diff --git a/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp b/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
index aa32591532d..db3b186a231 100644
--- a/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
+++ b/ACE/apps/JAWS/clients/Caching/ID_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (ACE_ID_GENERATOR_C)
#define ACE_ID_GENERATOR_C
diff --git a/ACE/apps/JAWS/clients/Caching/Local_Locator.cpp b/ACE/apps/JAWS/clients/Caching/Local_Locator.cpp
index 00daa96b5ad..3e4840d616c 100644
--- a/ACE/apps/JAWS/clients/Caching/Local_Locator.cpp
+++ b/ACE/apps/JAWS/clients/Caching/Local_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (ACE_LOCAL_LOCATOR_C)
#define ACE_LOCAL_LOCATOR_C
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
index 60e395d5b76..c83053cea96 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (ACE_LOCATOR_REQUEST_REPLY_C)
#define ACE_LOCATOR_REQUEST_REPLY_C
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
index 9dd2f851ceb..9fc67319c64 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
@@ -1,7 +1,5 @@
/* -*- C++ -*- */
-// $Id$
-
#include "URL_Locator.h"
ACE_INLINE
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp
index 2c5665197a5..19df1267a8c 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp
+++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// URL_Array_Helper.cpp
#ifndef ACE_URL_ARRAY_HELPER_C
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
index b83d7e2716f..920322402b0 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
+++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (ACE_URL_LOCATOR_C)
#define ACE_URL_LOCATOR_C
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
index b356656d2d2..fbddf7a0ea5 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (ACE_URL_PROPERTIES_C)
#define ACE_URL_PROPERTIES_C
diff --git a/ACE/apps/JAWS/clients/Caching/caching.mpc b/ACE/apps/JAWS/clients/Caching/caching.mpc
index 98481c0972e..270c5fe7e03 100644
--- a/ACE/apps/JAWS/clients/Caching/caching.mpc
+++ b/ACE/apps/JAWS/clients/Caching/caching.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(http_client) : aceexe {
avoids += ace_for_tao
requires += ace_filecache
diff --git a/ACE/apps/JAWS/clients/Caching/test_URL.cpp b/ACE/apps/JAWS/clients/Caching/test_URL.cpp
index 69fe8b1f678..dd04c2fa5d2 100644
--- a/ACE/apps/JAWS/clients/Caching/test_URL.cpp
+++ b/ACE/apps/JAWS/clients/Caching/test_URL.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Locator_Request_Reply.h"
int ACE_TMAIN (int , ACE_TCHAR *[])
diff --git a/ACE/apps/JAWS/server/HTTP_Config.cpp b/ACE/apps/JAWS/server/HTTP_Config.cpp
index a76375a9017..884dae7f144 100644
--- a/ACE/apps/JAWS/server/HTTP_Config.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Config.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// HTTP_Config.cpp
#include "ace/OS_NS_stdlib.h"
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp
index b7e6a6e76f2..3b7f935c921 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// HTTP_Service.cpp -- simple implementation of the HTTP protocol
#include "ace/Message_Block.h"
diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.cpp b/ACE/apps/JAWS/server/HTTP_Helpers.cpp
index 2676a934d91..e952c85bf5f 100644
--- a/ACE/apps/JAWS/server/HTTP_Helpers.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Helpers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// HTTP_Helpers.cpp -- Helper utilities for both server and client
#include "HTTP_Helpers.h"
diff --git a/ACE/apps/JAWS/server/HTTP_Request.cpp b/ACE/apps/JAWS/server/HTTP_Request.cpp
index 7b5a69b62d2..09a59604da3 100644
--- a/ACE/apps/JAWS/server/HTTP_Request.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Message_Block.h"
#include "HTTP_Request.h"
#include "HTTP_Helpers.h"
diff --git a/ACE/apps/JAWS/server/HTTP_Response.cpp b/ACE/apps/JAWS/server/HTTP_Response.cpp
index 4860295a86a..a08806f2f04 100644
--- a/ACE/apps/JAWS/server/HTTP_Response.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Response.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_ctype.h"
diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp
index a2eca645df5..f5964316738 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ACE_BUILD_SVC_DLL
#define ACE_BUILD_SVC_DLL
#endif /* ACE_BUILD_SVC_DLL */
diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
index e65b4cb54a2..a248dc61873 100644
--- a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS_Concurrency.h"
JAWS_Concurrency_Base::JAWS_Concurrency_Base (void)
diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.h b/ACE/apps/JAWS/server/JAWS_Concurrency.h
index 0020d24fc84..30db0052455 100644
--- a/ACE/apps/JAWS/server/JAWS_Concurrency.h
+++ b/ACE/apps/JAWS/server/JAWS_Concurrency.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CONCURRENCY_H
#define JAWS_CONCURRENCY_H
diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp
index 8a6f12acce5..af143104c1a 100644
--- a/ACE/apps/JAWS/server/JAWS_IO.cpp
+++ b/ACE/apps/JAWS/server/JAWS_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_uio.h"
#include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
index 77fb54c6e48..88b81037d2b 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS_Pipeline.h"
JAWS_Pipeline::JAWS_Pipeline (void)
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.h b/ACE/apps/JAWS/server/JAWS_Pipeline.h
index 919c982977c..a4e64971a02 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline.h
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PIPELINE_H
#define JAWS_PIPELINE_H
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
index 967add903c7..e3a1a38d33b 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_PIPELINE_HANDLER_CPP
#define JAWS_PIPELINE_HANDLER_CPP
diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
index 7e9becb6f5e..255c966ea2e 100644
--- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
+++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PIPELINE_HANDLER_H
#define JAWS_PIPELINE_HANDLER_H
diff --git a/ACE/apps/JAWS/server/Parse_Headers.cpp b/ACE/apps/JAWS/server/Parse_Headers.cpp
index 53fc918a9e2..d69cdef5af9 100644
--- a/ACE/apps/JAWS/server/Parse_Headers.cpp
+++ b/ACE/apps/JAWS/server/Parse_Headers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Parse_Headers.h"
diff --git a/ACE/apps/JAWS/server/main.cpp b/ACE/apps/JAWS/server/main.cpp
index 83ee3caa7f3..ba09f3ffd13 100644
--- a/ACE/apps/JAWS/server/main.cpp
+++ b/ACE/apps/JAWS/server/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "ace/Reactor.h"
#include "ace/Filecache.h"
diff --git a/ACE/apps/JAWS/server/server.mpc b/ACE/apps/JAWS/server/server.mpc
index e6b9f1d9806..ac4605fbfbc 100644
--- a/ACE/apps/JAWS/server/server.mpc
+++ b/ACE/apps/JAWS/server/server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(JAWS) : install, ace_output, acelib {
sharedname = JAWS
dynamicflags += ACE_BUILD_SVC_DLL
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index 37a31f45d09..75a9642e16d 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// benchd: Adapted from the "ntalker" example.
// Sumedh Mungee
diff --git a/ACE/apps/JAWS/stress_testing/client.h b/ACE/apps/JAWS/stress_testing/client.h
index 58ef98c7bdf..3e5967c548d 100644
--- a/ACE/apps/JAWS/stress_testing/client.h
+++ b/ACE/apps/JAWS/stress_testing/client.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#include "util.h"
#include "http.h"
diff --git a/ACE/apps/JAWS/stress_testing/connection.cpp b/ACE/apps/JAWS/stress_testing/connection.cpp
index 82222e24a30..9c3b157ba28 100644
--- a/ACE/apps/JAWS/stress_testing/connection.cpp
+++ b/ACE/apps/JAWS/stress_testing/connection.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "connection.h"
// Make the connection to the WEB server
diff --git a/ACE/apps/JAWS/stress_testing/connection.h b/ACE/apps/JAWS/stress_testing/connection.h
index db37ff07f35..faa10f7a53f 100644
--- a/ACE/apps/JAWS/stress_testing/connection.h
+++ b/ACE/apps/JAWS/stress_testing/connection.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#ifndef _D_connection
diff --git a/ACE/apps/JAWS/stress_testing/cp.cpp b/ACE/apps/JAWS/stress_testing/cp.cpp
index b593cc23f0a..f1a5d068ce1 100644
--- a/ACE/apps/JAWS/stress_testing/cp.cpp
+++ b/ACE/apps/JAWS/stress_testing/cp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "cp.h"
Client_Parameters::Client_Parameters(int i) {
diff --git a/ACE/apps/JAWS/stress_testing/cp.h b/ACE/apps/JAWS/stress_testing/cp.h
index ad2e5ddf31b..871897a976e 100644
--- a/ACE/apps/JAWS/stress_testing/cp.h
+++ b/ACE/apps/JAWS/stress_testing/cp.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "util.h"
#include "stats.h"
diff --git a/ACE/apps/JAWS/stress_testing/global.h b/ACE/apps/JAWS/stress_testing/global.h
index 0d916f2cc41..ae7977c3929 100644
--- a/ACE/apps/JAWS/stress_testing/global.h
+++ b/ACE/apps/JAWS/stress_testing/global.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ACE.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ACE/apps/JAWS/stress_testing/http.h b/ACE/apps/JAWS/stress_testing/http.h
index efce9235e56..0ea53bf8c1d 100644
--- a/ACE/apps/JAWS/stress_testing/http.h
+++ b/ACE/apps/JAWS/stress_testing/http.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#define CONTENT_ENCODING_HEADER "Content-encoding: "
diff --git a/ACE/apps/JAWS/stress_testing/http_tester.cpp b/ACE/apps/JAWS/stress_testing/http_tester.cpp
index e00f48b09eb..da5f08a741c 100644
--- a/ACE/apps/JAWS/stress_testing/http_tester.cpp
+++ b/ACE/apps/JAWS/stress_testing/http_tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client.h"
int Client_Parameters::tcp_nodelay;
diff --git a/ACE/apps/JAWS/stress_testing/stats.cpp b/ACE/apps/JAWS/stress_testing/stats.cpp
index 97b6ef3ded6..b2b29f5b8f4 100644
--- a/ACE/apps/JAWS/stress_testing/stats.cpp
+++ b/ACE/apps/JAWS/stress_testing/stats.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stats.h"
Stats::Stats(int size) {
diff --git a/ACE/apps/JAWS/stress_testing/stats.h b/ACE/apps/JAWS/stress_testing/stats.h
index b5ef4a4f4a0..39f719c4cec 100644
--- a/ACE/apps/JAWS/stress_testing/stats.h
+++ b/ACE/apps/JAWS/stress_testing/stats.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#ifndef _D_Stats
diff --git a/ACE/apps/JAWS/stress_testing/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp
index 7da1d9df44a..0de9231957b 100644
--- a/ACE/apps/JAWS/stress_testing/util.cpp
+++ b/ACE/apps/JAWS/stress_testing/util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "util.h"
URL::URL(char *input_buf) {
diff --git a/ACE/apps/JAWS/stress_testing/util.h b/ACE/apps/JAWS/stress_testing/util.h
index 875a8cd80e0..ea5b29da104 100644
--- a/ACE/apps/JAWS/stress_testing/util.h
+++ b/ACE/apps/JAWS/stress_testing/util.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "connection.h"
#ifndef _D_URL
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.cpp b/ACE/apps/JAWS2/HTTPU/http_base.cpp
index 80e6e844614..847ab4bf357 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Parse_Headers.h"
#include "HTTPU/http_base.h"
#include "HTTPU/http_headers.h"
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h
index a6f6b5b09da..5c421faf523 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.h
+++ b/ACE/apps/JAWS2/HTTPU/http_base.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTTPU_HTTP_BASE_H
#define HTTPU_HTTP_BASE_H
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.inl b/ACE/apps/JAWS2/HTTPU/http_base.inl
index 3c862c5b5fb..67ae932c433 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_base.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/http_export.h b/ACE/apps/JAWS2/HTTPU/http_export.h
index b0f6848cba2..51a3196fe5d 100644
--- a/ACE/apps/JAWS2/HTTPU/http_export.h
+++ b/ACE/apps/JAWS2/HTTPU/http_export.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Definition for Win32 Export directives.
// This file is generated automatically by
// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
index 77db706dc15..6540b3208dc 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/RB_Tree.h"
#include "HTTPU/http_headers.h"
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h
index 67e423bad83..839df6d7ff5 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.h
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.h
@@ -1,5 +1,3 @@
-// $Id$
-
// by James Hu
// Borrowed from HTTP_Headers.*, which appears to be irrelevent now anyway.
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.inl b/ACE/apps/JAWS2/HTTPU/http_headers.inl
index 3cfbaddae1b..4e7f4d408b9 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.cpp b/ACE/apps/JAWS2/HTTPU/http_request.cpp
index d4f5eb4366b..a91632d2fcf 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTPU/http_request.h"
#include "HTTPU/parse_http_request.h"
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.h b/ACE/apps/JAWS2/HTTPU/http_request.h
index 56f9dab37d8..a60bc47ad1e 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.h
+++ b/ACE/apps/JAWS2/HTTPU/http_request.h
@@ -1,5 +1,3 @@
-// $Id$
-
// There are two kinds of HTTP Requests in a proxy.
// One is the kind you have to read in from the HTTP client.
// The other is the kind you issue to the server.
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.inl b/ACE/apps/JAWS2/HTTPU/http_request.inl
index a6adeb98e92..92322e1d445 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_request.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.cpp b/ACE/apps/JAWS2/HTTPU/http_response.cpp
index a342db54ffb..5599ff28613 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_response.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTPU/http_response.h"
void
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.h b/ACE/apps/JAWS2/HTTPU/http_response.h
index cbef4d1818f..abb28aa66c4 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.h
+++ b/ACE/apps/JAWS2/HTTPU/http_response.h
@@ -1,5 +1,3 @@
-// $Id$
-
// There are two kinds of HTTP Responses in a proxy.
// One is the kind you have to read in from the HTTP server.
// The other is the kind you issue to the HTTP client.
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.inl b/ACE/apps/JAWS2/HTTPU/http_response.inl
index 9f4eb0d244f..cd493002646 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_response.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp
index 75a69ffd0d0..b9103f24eb6 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "HTTPU/http_status.h"
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.h b/ACE/apps/JAWS2/HTTPU/http_status.h
index 4f9efdc9fb4..9e60a75cd47 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.h
+++ b/ACE/apps/JAWS2/HTTPU/http_status.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTTPU_HTTP_STATUS_HPP
#define HTTPU_HTTP_STATUS_HPP
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.inl b/ACE/apps/JAWS2/HTTPU/http_status.inl
index 0247ddeb738..a78a24f560a 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_status.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/httpu.mpc b/ACE/apps/JAWS2/HTTPU/httpu.mpc
index 63b20aca8f2..57ad182a41f 100644
--- a/ACE/apps/JAWS2/HTTPU/httpu.mpc
+++ b/ACE/apps/JAWS2/HTTPU/httpu.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(HTTPU) : ace_output, acelib {
sharedname = HTTPU
dynamicflags += HTTPU_BUILD_DLL
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
index 84e18b1bcb8..e5407b4c566 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTPU/parse_http_request.h"
Parse_HTTP_Request::Parse_HTTP_Request (const char *request)
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.h b/ACE/apps/JAWS2/HTTPU/parse_http_request.h
index b7b82e30fab..2b9ca414d48 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_request.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTTPU_PARSE_HTTP_REQUEST_H
#define HTTPU_PARSE_HTTP_REQUEST_H
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.inl b/ACE/apps/JAWS2/HTTPU/parse_http_request.inl
index 3ef87d48479..129c634d0c7 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_request.inl
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
index 130c680446b..c0959a9daae 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTPU/parse_http_response.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.h b/ACE/apps/JAWS2/HTTPU/parse_http_response.h
index 1bf606e386b..89ca5afecd7 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_response.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTTPU_PARSE_HTTP_RESPONSE_H
#define HTTPU_PARSE_HTTP_RESPONSE_H
diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.inl b/ACE/apps/JAWS2/HTTPU/parse_http_response.inl
index 57a694377e5..66a66939915 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_http_response.inl
+++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.inl
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_INLINE
# define ACE_INLINE
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
index 9519ced6897..1ca0b71bb93 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdlib.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h
index fa05b72ceb3..92b3cec2d1f 100644
--- a/ACE/apps/JAWS2/HTTPU/parse_url.h
+++ b/ACE/apps/JAWS2/HTTPU/parse_url.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef HTTPU_HTTP_PARSE_H
#define HTTPU_HTTP_PARSE_H
diff --git a/ACE/apps/JAWS2/HTTP_10.cpp b/ACE/apps/JAWS2/HTTP_10.cpp
index fa93b789dc8..e3d7e08a06b 100644
--- a/ACE/apps/JAWS2/HTTP_10.cpp
+++ b/ACE/apps/JAWS2/HTTP_10.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTP_10.h"
#include "JAWS/JAWS.h"
diff --git a/ACE/apps/JAWS2/HTTP_10.h b/ACE/apps/JAWS2/HTTP_10.h
index 382e0d7a563..ecd6996d6f2 100644
--- a/ACE/apps/JAWS2/HTTP_10.h
+++ b/ACE/apps/JAWS2/HTTP_10.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_HTTP_10_H
#define JAWS_HTTP_10_H
diff --git a/ACE/apps/JAWS2/HTTP_10_Parse.cpp b/ACE/apps/JAWS2/HTTP_10_Parse.cpp
index b7965fd1472..5e137cf6d4b 100644
--- a/ACE/apps/JAWS2/HTTP_10_Parse.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Parse.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTP_10.h"
#include "JAWS/JAWS.h"
diff --git a/ACE/apps/JAWS2/HTTP_10_Read.cpp b/ACE/apps/JAWS2/HTTP_10_Read.cpp
index b5b08fca651..b5fd077a247 100644
--- a/ACE/apps/JAWS2/HTTP_10_Read.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Read.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTP_10.h"
#include "JAWS/JAWS.h"
diff --git a/ACE/apps/JAWS2/HTTP_10_Request.cpp b/ACE/apps/JAWS2/HTTP_10_Request.cpp
index 8fadbb131c8..0a3fe5ef650 100644
--- a/ACE/apps/JAWS2/HTTP_10_Request.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/JAWS.h"
#include "HTTP_10_Request.h"
#include "ace/OS_NS_pwd.h"
diff --git a/ACE/apps/JAWS2/HTTP_10_Request.h b/ACE/apps/JAWS2/HTTP_10_Request.h
index c6b204abe98..cd6d45bff9b 100644
--- a/ACE/apps/JAWS2/HTTP_10_Request.h
+++ b/ACE/apps/JAWS2/HTTP_10_Request.h
@@ -1,6 +1,4 @@
// -*- c++ -*-
-// $Id$
-
#ifndef JAWS_HTTP_10_REQUEST_H
#define JAWS_HTTP_10_REQUEST_H
diff --git a/ACE/apps/JAWS2/HTTP_10_Write.cpp b/ACE/apps/JAWS2/HTTP_10_Write.cpp
index 6b65503095c..97ded62a99c 100644
--- a/ACE/apps/JAWS2/HTTP_10_Write.cpp
+++ b/ACE/apps/JAWS2/HTTP_10_Write.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/JAWS.h"
#include "JAWS/IO.h"
#include "JAWS/IO_Handler.h"
diff --git a/ACE/apps/JAWS2/HTTP_Policy.cpp b/ACE/apps/JAWS2/HTTP_Policy.cpp
index 34d2a89788f..8c8fd56f9cb 100644
--- a/ACE/apps/JAWS2/HTTP_Policy.cpp
+++ b/ACE/apps/JAWS2/HTTP_Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HTTP_Policy.h"
diff --git a/ACE/apps/JAWS2/HTTP_Policy.h b/ACE/apps/JAWS2/HTTP_Policy.h
index 873b30f5070..a7fc16f0fde 100644
--- a/ACE/apps/JAWS2/HTTP_Policy.h
+++ b/ACE/apps/JAWS2/HTTP_Policy.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef HTTP_POLICY_H
#define HTTP_POLICY_H
diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
index 4901e6ef7c2..193c3ab5059 100644
--- a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
+++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_ASSOC_ARRAY_CPP
#define JAWS_ASSOC_ARRAY_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h
index d5692a5cf03..811f75ae4d5 100644
--- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h
+++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_ASSOC_ARRAY_H
#define JAWS_ASSOC_ARRAY_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
index e86e3667597..459a88f1d66 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_CACHE_HASH_T_CPP
#define JAWS_CACHE_HASH_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
index 7b3bd752ea0..761a27bc364 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CACHE_HASH_T_H
#define JAWS_CACHE_HASH_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
index b19ff8e79b1..99185b8280a 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_CACHE_HEAP_T_CPP
#define JAWS_CACHE_HEAP_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
index 16fbe890fe6..89f46561ace 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CACHE_HEAP_T_H
#define JAWS_CACHE_HEAP_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
index f6515d2652d..aadbfaf550e 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_CACHE_LIST_T_CPP
#define JAWS_CACHE_LIST_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h
index 7dd9c7c8ca1..d7fee623365 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CACHE_LIST_T_H
#define JAWS_CACHE_LIST_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
index 316ddd472fe..2bc6bc8835a 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h
index c7837b935ba..af2c54ca3fb 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CACHE_MANAGER_H
#define JAWS_CACHE_MANAGER_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
index 96c0b4df63b..fe9cabbedad 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_CACHE_MANAGER_T_CPP
#define JAWS_CACHE_MANAGER_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
index 10165a462a5..9c8c1de7307 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h
@@ -1,7 +1,5 @@
/* -*- c++ -*- */
// Hey Emacs! This is a C++ file!
-// $Id$
-
#ifndef JAWS_CACHE_MANAGER_T_H
#define JAWS_CACHE_MANAGER_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
index cc3799bb3f0..b036842f65e 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
+++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Cache_Object.h"
#include "ace/Malloc_Base.h"
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h
index 44f7e2cd541..19c717f336e 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Object.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef JAWS_CACHE_OBJECT_H
#define JAWS_CACHE_OBJECT_H
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
index 4506ff09efa..6f41bfde363 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Concurrency.h"
#include "JAWS/IO_Handler.h"
#include "JAWS/Pipeline.h"
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.h b/ACE/apps/JAWS2/JAWS/Concurrency.h
index 6f65c5017bd..85f495facb5 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.h
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CONCURRENCY_H
#define JAWS_CONCURRENCY_H
diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.cpp b/ACE/apps/JAWS2/JAWS/Data_Block.cpp
index b6c21510db1..7c46296241a 100644
--- a/ACE/apps/JAWS2/JAWS/Data_Block.cpp
+++ b/ACE/apps/JAWS2/JAWS/Data_Block.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Data_Block.h"
#include "JAWS/Policy.h"
diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.h b/ACE/apps/JAWS2/JAWS/Data_Block.h
index 94afaa93586..4beb61cdb4c 100644
--- a/ACE/apps/JAWS2/JAWS/Data_Block.h
+++ b/ACE/apps/JAWS2/JAWS/Data_Block.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_DATA_BLOCK_H
#define JAWS_DATA_BLOCK_H
diff --git a/ACE/apps/JAWS2/JAWS/Export.h b/ACE/apps/JAWS2/JAWS/Export.h
index 68f8d135ddf..a78a5cb03ad 100644
--- a/ACE/apps/JAWS2/JAWS/Export.h
+++ b/ACE/apps/JAWS2/JAWS/Export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s JAWS
// ------------------------------
diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp
index 4d89af85d4f..f731cb2a956 100644
--- a/ACE/apps/JAWS2/JAWS/FILE.cpp
+++ b/ACE/apps/JAWS2/JAWS/FILE.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Guard_T.h"
#include "JAWS/FILE.h"
diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h
index 20f972a31c3..3ab96227ad7 100644
--- a/ACE/apps/JAWS2/JAWS/FILE.h
+++ b/ACE/apps/JAWS2/JAWS/FILE.h
@@ -1,5 +1,3 @@
-// $Id$
-
/* -*- c++ -*- */
#ifndef JAWS_FILE_H
diff --git a/ACE/apps/JAWS2/JAWS/Filecache.cpp b/ACE/apps/JAWS2/JAWS/Filecache.cpp
index b5de6c4d3ae..652a169b062 100644
--- a/ACE/apps/JAWS2/JAWS/Filecache.cpp
+++ b/ACE/apps/JAWS2/JAWS/Filecache.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/FILE_Connector.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/apps/JAWS2/JAWS/Filecache.h b/ACE/apps/JAWS2/JAWS/Filecache.h
index 7ea313a43b1..03a5e2c3789 100644
--- a/ACE/apps/JAWS2/JAWS/Filecache.h
+++ b/ACE/apps/JAWS2/JAWS/Filecache.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_FILECACHE_H
#define JAWS_FILECACHE_H
diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
index f498ce12681..097f932b0c3 100644
--- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_HASH_BUCKET_T_CPP
#define JAWS_HASH_BUCKET_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
index e7da2f6f680..670834267fe 100644
--- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
+++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h
@@ -1,7 +1,5 @@
/* -*- c++ -*- */
// Hey Emacs! This is a C++ file!
-// $Id$
-
#ifndef JAWS_HASH_BUCKET_T_H
#define JAWS_HASH_BUCKET_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Headers.h b/ACE/apps/JAWS2/JAWS/Headers.h
index f16db921915..54d4ede3231 100644
--- a/ACE/apps/JAWS2/JAWS/Headers.h
+++ b/ACE/apps/JAWS2/JAWS/Headers.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_HEADERS_H
#define JAWS_HEADERS_H
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
index 979092e30ac..c44ae37fd02 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Data_Block.h"
#include "JAWS/IO_Acceptor.h"
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
index e14a38a2714..35a7473ece6 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_IO_ACCEPTOR_H
#define JAWS_IO_ACCEPTOR_H
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
index 1e9d1af427c..0d2207d83d0 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Proactor.h"
#include "ace/Filecache.h"
#include "ace/OS_NS_unistd.h"
diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
index 40a53610169..9b8e7c3068f 100644
--- a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
+++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Message_Block.h"
#include "ace/SOCK_Stream.h"
#include "ace/Filecache.h"
diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
index bbfdb9cff96..cc3ac3f120d 100644
--- a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
+++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Parse_Headers.h"
#include "ace/OS_NS_string.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h
index 89238136fa4..6aefd116307 100644
--- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h
+++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PARSE_HEADERS_H
#define JAWS_PARSE_HEADERS_H
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.cpp b/ACE/apps/JAWS2/JAWS/Pipeline.cpp
index 6753854a683..b6a3dc93c9f 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Pipeline.h"
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.h b/ACE/apps/JAWS2/JAWS/Pipeline.h
index 30e4bf37cc2..d1fc4a7abde 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PIPELINE_H
#define JAWS_PIPELINE_H
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
index afacc4eacb4..c5973bfd6e5 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_PIPELINE_HANDLER_T_CPP
#define JAWS_PIPELINE_HANDLER_T_CPP
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
index 4d4d808fee2..51db1562e04 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PIPELINE_HANDLER_T_H
#define JAWS_PIPELINE_HANDLER_T_H
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index 277e6d72586..3f27630b8b0 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Jaws_IO.h"
#include "JAWS/Pipeline_Tasks.h"
#include "JAWS/Pipeline_Handler_T.h"
diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
index 3bbb5080593..87250c98d19 100644
--- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
+++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_PIPELINE_TASKS_H
#define JAWS_PIPELINE_TASKS_H
diff --git a/ACE/apps/JAWS2/JAWS/Policy.cpp b/ACE/apps/JAWS2/JAWS/Policy.cpp
index 485c6658b73..207863c729d 100644
--- a/ACE/apps/JAWS2/JAWS/Policy.cpp
+++ b/ACE/apps/JAWS2/JAWS/Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Policy.h"
#include "JAWS/Concurrency.h"
#include "JAWS/IO_Handler.h"
diff --git a/ACE/apps/JAWS2/JAWS/Policy.h b/ACE/apps/JAWS2/JAWS/Policy.h
index eb63bd8d0d9..0d4b6f3d606 100644
--- a/ACE/apps/JAWS2/JAWS/Policy.h
+++ b/ACE/apps/JAWS2/JAWS/Policy.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_POLICY_H
#define JAWS_POLICY_H
diff --git a/ACE/apps/JAWS2/JAWS/Reaper.cpp b/ACE/apps/JAWS2/JAWS/Reaper.cpp
index 98814408447..1fe52cb04e7 100644
--- a/ACE/apps/JAWS2/JAWS/Reaper.cpp
+++ b/ACE/apps/JAWS2/JAWS/Reaper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Reaper.h"
#include "JAWS/Concurrency.h"
#include "JAWS/IO_Acceptor.h"
diff --git a/ACE/apps/JAWS2/JAWS/Reaper.h b/ACE/apps/JAWS2/JAWS/Reaper.h
index ceb4340d8d4..b29211eb728 100644
--- a/ACE/apps/JAWS2/JAWS/Reaper.h
+++ b/ACE/apps/JAWS2/JAWS/Reaper.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_REAPER_H
#define JAWS_REAPER_H
diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp
index ce0056e2c00..e26ba15d3f8 100644
--- a/ACE/apps/JAWS2/JAWS/Server.cpp
+++ b/ACE/apps/JAWS2/JAWS/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-lite.h"
#include "ace/OS_NS_string.h"
#include "ace/Get_Opt.h"
diff --git a/ACE/apps/JAWS2/JAWS/Server.h b/ACE/apps/JAWS2/JAWS/Server.h
index c8a3fc30708..336b6c85062 100644
--- a/ACE/apps/JAWS2/JAWS/Server.h
+++ b/ACE/apps/JAWS2/JAWS/Server.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_SERVER_H
#define JAWS_SERVER_H
diff --git a/ACE/apps/JAWS2/JAWS/Waiter.cpp b/ACE/apps/JAWS2/JAWS/Waiter.cpp
index 4b6b1aec4b8..b35e560b05b 100644
--- a/ACE/apps/JAWS2/JAWS/Waiter.cpp
+++ b/ACE/apps/JAWS2/JAWS/Waiter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Proactor.h"
#include "JAWS/Waiter.h"
diff --git a/ACE/apps/JAWS2/JAWS/Waiter.h b/ACE/apps/JAWS2/JAWS/Waiter.h
index ed0bce47cc1..613868e7f9e 100644
--- a/ACE/apps/JAWS2/JAWS/Waiter.h
+++ b/ACE/apps/JAWS2/JAWS/Waiter.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_WAITER_H
#define JAWS_WAITER_H
diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc
index 9c7f9de8b0f..aaeb27bfc5d 100644
--- a/ACE/apps/JAWS2/JAWS/jaws2.mpc
+++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(JAWS2) : ace_output, acelib {
sharedname = JAWS2
dynamicflags += JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS2/main.cpp b/ACE/apps/JAWS2/main.cpp
index a5f7272ad81..9001043e75d 100644
--- a/ACE/apps/JAWS2/main.cpp
+++ b/ACE/apps/JAWS2/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "JAWS/Server.h"
#include "HTTP_10.h"
diff --git a/ACE/apps/JAWS3/bench/average.cpp b/ACE/apps/JAWS3/bench/average.cpp
index d6336cc5e9e..e83ca23566b 100644
--- a/ACE/apps/JAWS3/bench/average.cpp
+++ b/ACE/apps/JAWS3/bench/average.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
int
ACE_TMAIN(int, ACE_TCHAR *[])
{
diff --git a/ACE/apps/JAWS3/bench/mkfiles.cpp b/ACE/apps/JAWS3/bench/mkfiles.cpp
index ce7513e343e..2f2368d6775 100644
--- a/ACE/apps/JAWS3/bench/mkfiles.cpp
+++ b/ACE/apps/JAWS3/bench/mkfiles.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
//FUZZ: disable check_for_math_include/
#include <math.h>
diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp
index 01948c864e7..81a99be3f4c 100644
--- a/ACE/apps/JAWS3/bench/rqfiles.cpp
+++ b/ACE/apps/JAWS3/bench/rqfiles.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Svc_Handler.h"
#include "ace/Reactor.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_Data.h b/ACE/apps/JAWS3/http/HTTP_Data.h
index 2853dd9ca65..39dd63b79b7 100644
--- a/ACE/apps/JAWS3/http/HTTP_Data.h
+++ b/ACE/apps/JAWS3/http/HTTP_Data.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_HTTP_DATA_H
#define JAWS_HTTP_DATA_H
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
index b157388bf13..b548cb52685 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/Get_Opt.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index 3b469593dcb..c8df6d3eba1 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_HTTP_SERVICE_HANDLER_H
#define JAWS_HTTP_SERVICE_HANDLER_H
diff --git a/ACE/apps/JAWS3/http/HTTP_States.h b/ACE/apps/JAWS3/http/HTTP_States.h
index 465f9c9bba0..8d88514116e 100644
--- a/ACE/apps/JAWS3/http/HTTP_States.h
+++ b/ACE/apps/JAWS3/http/HTTP_States.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_HTTP_STATES_H
#define JAWS_HTTP_STATES_H
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
index 298f5b02274..bc00dc656d4 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif /*JAWS_BUILD_DLL*/
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.h b/ACE/apps/JAWS3/jaws3/Asynch_IO.h
index f2b7cb81cb7..bb55cf58d5a 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_ASYNCH_IO_H
#define JAWS_ASYNCH_IO_H
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
index 21c65e73339..08567ddb5b2 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_ASYNCH_IO_HELPERS_H
#define JAWS_ASYNCH_IO_HELPERS_H
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
index 07e2d795403..7960f2a0368 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_CACHED_ALLOCATOR_T_CPP
#define JAWS_CACHED_ALLOCATOR_T_CPP
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index adc03508dff..67082e2bad6 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CACHED_ALLOCATOR_T_H
#define JAWS_CACHED_ALLOCATOR_T_H
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.cpp b/ACE/apps/JAWS3/jaws3/Concurrency.cpp
index 036ef47f4b8..de8f19e417d 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_strings.h"
#include "ace/Message_Block.h"
#include "ace/Singleton.h"
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
index 09e8cd3f6cd..3882a4e8158 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
+++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Message_Block.h"
#include "ace/Singleton.h"
#include "ace/Synch_Traits.h"
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
index fe7fb25955c..cbae2ebe0b4 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CONCURRENCY_T_H
#define JAWS_CONCURRENCY_T_H
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp
index cf8ab94d3a4..ff2fa889489 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.cpp
+++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_string.h"
#include "ace/FILE_Connector.h"
diff --git a/ACE/apps/JAWS3/jaws3/Config_File.h b/ACE/apps/JAWS3/jaws3/Config_File.h
index aab87c502ca..cc93f9af134 100644
--- a/ACE/apps/JAWS3/jaws3/Config_File.h
+++ b/ACE/apps/JAWS3/jaws3/Config_File.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_CONFIG_FILE_H
#define JAWS_CONFIG_FILE_H
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.cpp b/ACE/apps/JAWS3/jaws3/Datagram.cpp
index 3849e7afd1d..36887ccc4bb 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.cpp
+++ b/ACE/apps/JAWS3/jaws3/Datagram.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index 0f6b7c59a34..244c1a35f79 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_DATAGRAM_H
#define JAWS_DATAGRAM_H
diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
index 70df04e90fc..f971714d96f 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
+++ b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.h b/ACE/apps/JAWS3/jaws3/Event_Completer.h
index 6114605437d..26e2e4b9775 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Completer.h
+++ b/ACE/apps/JAWS3/jaws3/Event_Completer.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_EVENT_COMPLETER_H
#define JAWS_EVENT_COMPLETER_H
diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
index 6b498e23125..adf97124453 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
+++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "ace/Thread.h"
#include "ace/Reactor.h"
diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
index 30a29eed34f..d7534dd3c23 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
+++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_EVENT_DISPATCHER_H
#define JAWS_EVENT_DISPATCHER_H
diff --git a/ACE/apps/JAWS3/jaws3/Event_Result.h b/ACE/apps/JAWS3/jaws3/Event_Result.h
index c82bc12d408..875d3366c1c 100644
--- a/ACE/apps/JAWS3/jaws3/Event_Result.h
+++ b/ACE/apps/JAWS3/jaws3/Event_Result.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_EVENT_RESULT_H
#define JAWS_EVENT_RESULT_H
diff --git a/ACE/apps/JAWS3/jaws3/Export.h b/ACE/apps/JAWS3/jaws3/Export.h
index 8af831df529..324b6d262ac 100644
--- a/ACE/apps/JAWS3/jaws3/Export.h
+++ b/ACE/apps/JAWS3/jaws3/Export.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Definition for Win32 Export directives.
// This file is generated automatically by
// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp
index 181b0582f0f..a19ef5bc3dd 100644
--- a/ACE/apps/JAWS3/jaws3/FILE.cpp
+++ b/ACE/apps/JAWS3/jaws3/FILE.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-all.h"
#include "ace/Guard_T.h"
#include "ace/Synch_Traits.h"
diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
index f4187cbb806..c9e7e0231cf 100644
--- a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif /*JAWS_BUILD_DLL*/
diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
index a910a4fb029..eb0b8930285 100644
--- a/ACE/apps/JAWS3/jaws3/Jaws_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_IO_H
#define JAWS_IO_H
diff --git a/ACE/apps/JAWS3/jaws3/Options.cpp b/ACE/apps/JAWS3/jaws3/Options.cpp
index 19c7a40406e..572fd06697f 100644
--- a/ACE/apps/JAWS3/jaws3/Options.cpp
+++ b/ACE/apps/JAWS3/jaws3/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdlib.h"
#ifndef JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h
index ff3720706ad..3f9d847475b 100644
--- a/ACE/apps/JAWS3/jaws3/Options.h
+++ b/ACE/apps/JAWS3/jaws3/Options.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_OPTIONS_H
#define JAWS_OPTIONS_H
diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
index 164696ae21a..e2b715c5641 100644
--- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
+++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
index 68439365c92..11cc55d0dc3 100644
--- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
+++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef JAWS_PROTOCOL_HANDLER_H
#define JAWS_PROTOCOL_HANDLER_H
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
index c8af2f39d01..b7834e18a71 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Reactor.h"
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.h b/ACE/apps/JAWS3/jaws3/Reactive_IO.h
index 1efc0f86cc5..d4bf77283bf 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_REACTIVE_IO_H
#define JAWS_REACTIVE_IO_H
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index d14f6c33998..ce956045436 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_REACTIVE_IO_HELPERS_H
#define JAWS_REACTIVE_IO_HELPERS_H
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
index 24c79eec032..a379721fb69 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_signal.h"
#include "ace/OS_NS_Thread.h"
#include "ace/Thread.h"
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
index f1564b812a0..242db3f9f8a 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.h
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_SIGNAL_TASK_H
#define JAWS_SIGNAL_TASK_H
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
index 94e35254cb7..7c187498c3d 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
index dfd856205e3..346509e57f3 100644
--- a/ACE/apps/JAWS3/jaws3/Symbol_Table.h
+++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_SYMBOL_TABLE_H
#define JAWS_SYMBOL_TABLE_H
diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.cpp b/ACE/apps/JAWS3/jaws3/Synch_IO.cpp
index 1f66363d8ea..fcf74484bd7 100644
--- a/ACE/apps/JAWS3/jaws3/Synch_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Synch_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ACE.h"
#ifndef JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.h b/ACE/apps/JAWS3/jaws3/Synch_IO.h
index 79c8a936a2e..d4d56063605 100644
--- a/ACE/apps/JAWS3/jaws3/Synch_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Synch_IO.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_SYNCH_IO_H
#define JAWS_SYNCH_IO_H
diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
index 8e0294e682b..76bdfd8c47b 100644
--- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdlib.h"
#include "ace/Message_Block.h"
diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
index c75fbb1cb1f..0600e9ca287 100644
--- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_THYBRID_CONCURRENCY_H
#define JAWS_THYBRID_CONCURRENCY_H
diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
index f68f7e22690..9a9d0ce104b 100644
--- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdlib.h"
#include "ace/Message_Block.h"
diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
index b9617b2fde3..2a614b2fb0d 100644
--- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_TPOOL_CONCURRENCY_H
#define JAWS_TPOOL_CONCURRENCY_H
diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
index c20cbca74f8..15a547c685e 100644
--- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
+++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Message_Block.h"
#ifndef JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
index 9feff7da706..32d57830192 100644
--- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_TPR_CONCURRENCY_H
#define JAWS_TPR_CONCURRENCY_H
diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
index ab2b3833a48..3bd8b01a112 100644
--- a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
+++ b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.h b/ACE/apps/JAWS3/jaws3/Task_Timer.h
index a31781a922a..7353fb4faa4 100644
--- a/ACE/apps/JAWS3/jaws3/Task_Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Task_Timer.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_TASK_TIMER_H
#define JAWS_TASK_TIMER_H
diff --git a/ACE/apps/JAWS3/jaws3/Templates.cpp b/ACE/apps/JAWS3/jaws3/Templates.cpp
index 60bca7b9bc8..bd9bf2f3737 100644
--- a/ACE/apps/JAWS3/jaws3/Templates.cpp
+++ b/ACE/apps/JAWS3/jaws3/Templates.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Reactor.h"
#include "ace/Select_Reactor.h"
#include "ace/Svc_Handler.h"
diff --git a/ACE/apps/JAWS3/jaws3/Timer.cpp b/ACE/apps/JAWS3/jaws3/Timer.cpp
index ff13f6dc75f..6dafd93a43a 100644
--- a/ACE/apps/JAWS3/jaws3/Timer.cpp
+++ b/ACE/apps/JAWS3/jaws3/Timer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h
index e381e3d2a36..9f00ed5a75d 100644
--- a/ACE/apps/JAWS3/jaws3/Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Timer.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef JAWS_TIMER_H
#define JAWS_TIMER_H
diff --git a/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp b/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp
index 50b956ea60a..9d46611044d 100644
--- a/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp
+++ b/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef JAWS_BUILD_DLL
#define JAWS_BUILD_DLL
#endif
diff --git a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h
index 9ce8434975f..3429dedbbab 100644
--- a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h
+++ b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h
@@ -1,6 +1,4 @@
/* -*- c+ -*- */
-// $Id$
-
#ifndef JAWS_TIMER_HELPERS_H
#define JAWS_TIMER_HELPERS_H
diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc
index e9fd913a402..22083544a4c 100644
--- a/ACE/apps/JAWS3/jaws3/jaws3.mpc
+++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(JAWS3) : ace_output, acelib {
sharedname = JAWS3
dynamicflags += JAWS_BUILD_DLL
diff --git a/ACE/apps/JAWS3/jaws3/main.cpp b/ACE/apps/JAWS3/jaws3/main.cpp
index a041a9822c1..52e2e2ac618 100644
--- a/ACE/apps/JAWS3/jaws3/main.cpp
+++ b/ACE/apps/JAWS3/jaws3/main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Log_Msg.h"
#include "ace/Reactor.h"
#include "ace/Select_Reactor.h"
diff --git a/ACE/apps/JAWS3/small/SS_Data.cpp b/ACE/apps/JAWS3/small/SS_Data.cpp
index a9b5a92843e..36f183e90eb 100644
--- a/ACE/apps/JAWS3/small/SS_Data.cpp
+++ b/ACE/apps/JAWS3/small/SS_Data.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SS_Data.h"
#include "SS_Service_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_Data.h b/ACE/apps/JAWS3/small/SS_Data.h
index 73fe97c38b4..84edf314676 100644
--- a/ACE/apps/JAWS3/small/SS_Data.h
+++ b/ACE/apps/JAWS3/small/SS_Data.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_DATA_H
#define TERA_SS_DATA_H
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
index 94c717b60b4..1b2b9d133bb 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#define ACE_BUILD_SVC_DLL
#include "ace/Get_Opt.h"
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index 482ccfdb049..a7e49ba2d8d 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_SERVICE_HANDLER_H
#define TERA_SS_SERVICE_HANDLER_H
diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.cpp b/ACE/apps/JAWS3/small/SS_State_DONE.cpp
index 3119fae00de..f90910b28b4 100644
--- a/ACE/apps/JAWS3/small/SS_State_DONE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_DONE.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SS_State_DONE.h"
#include "SS_Data.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.h b/ACE/apps/JAWS3/small/SS_State_DONE.h
index 2d41d18f9a1..de73a3e1c5d 100644
--- a/ACE/apps/JAWS3/small/SS_State_DONE.h
+++ b/ACE/apps/JAWS3/small/SS_State_DONE.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_STATE_DONE_H
#define TERA_SS_STATE_DONE_H
diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.cpp b/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
index 2f9dedda85e..56b41a304d5 100644
--- a/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "jaws3/IO.h"
#include "SS_State_ERROR.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.h b/ACE/apps/JAWS3/small/SS_State_ERROR.h
index d0acb3091a0..4fb09f3c758 100644
--- a/ACE/apps/JAWS3/small/SS_State_ERROR.h
+++ b/ACE/apps/JAWS3/small/SS_State_ERROR.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_STATE_ERROR_H
#define TERA_SS_STATE_ERROR_H
diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.cpp b/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
index 3914f820be9..17315cb587c 100644
--- a/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SS_State_READ.h"
#include "SS_State_PARSE.h"
#include "SS_State_WRITE.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.h b/ACE/apps/JAWS3/small/SS_State_PARSE.h
index c083d40eebf..d4224a3a078 100644
--- a/ACE/apps/JAWS3/small/SS_State_PARSE.h
+++ b/ACE/apps/JAWS3/small/SS_State_PARSE.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_STATE_PARSE_H
#define TERA_SS_STATE_PARSE_H
diff --git a/ACE/apps/JAWS3/small/SS_State_READ.cpp b/ACE/apps/JAWS3/small/SS_State_READ.cpp
index d49f04fdf68..3a06c9eaba9 100644
--- a/ACE/apps/JAWS3/small/SS_State_READ.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_READ.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "jaws3/IO.h"
#include "jaws3/Event_Completer.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_READ.h b/ACE/apps/JAWS3/small/SS_State_READ.h
index 69320c26270..c6e2fdcf5d0 100644
--- a/ACE/apps/JAWS3/small/SS_State_READ.h
+++ b/ACE/apps/JAWS3/small/SS_State_READ.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_STATE_READ_H
#define TERA_SS_STATE_READ_H
diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.cpp b/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
index d539bafcf6a..71d8dd1e3da 100644
--- a/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/FILE_Connector.h"
#include "ace/FILE_Addr.h"
#include "ace/FILE_IO.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.h b/ACE/apps/JAWS3/small/SS_State_WRITE.h
index 06acfb75b22..a12c2578ab9 100644
--- a/ACE/apps/JAWS3/small/SS_State_WRITE.h
+++ b/ACE/apps/JAWS3/small/SS_State_WRITE.h
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#ifndef TERA_SS_STATE_WRITE_H
#define TERA_SS_STATE_WRITE_H
diff --git a/ACE/apps/JAWS3/small/SS_Templates.cpp b/ACE/apps/JAWS3/small/SS_Templates.cpp
index 23b436a7d44..72c63565d56 100644
--- a/ACE/apps/JAWS3/small/SS_Templates.cpp
+++ b/ACE/apps/JAWS3/small/SS_Templates.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SOCK_Acceptor.h"
#include "ace/Singleton.h"
diff --git a/ACE/apps/drwho/BS_Client.cpp b/ACE/apps/drwho/BS_Client.cpp
index 95f2ea940d7..67f3a7c009a 100644
--- a/ACE/apps/drwho/BS_Client.cpp
+++ b/ACE/apps/drwho/BS_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "File_Manager.h"
#include "BS_Client.h"
diff --git a/ACE/apps/drwho/BS_Server.cpp b/ACE/apps/drwho/BS_Server.cpp
index 057fbc25a04..f658d018c1d 100644
--- a/ACE/apps/drwho/BS_Server.cpp
+++ b/ACE/apps/drwho/BS_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BS_Server.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/ACE/apps/drwho/Binary_Search.cpp b/ACE/apps/drwho/Binary_Search.cpp
index 2716c321950..9c18195f35f 100644
--- a/ACE/apps/drwho/Binary_Search.cpp
+++ b/ACE/apps/drwho/Binary_Search.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Binary_Search.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/CM_Client.cpp b/ACE/apps/drwho/CM_Client.cpp
index a901ab41547..36e8c9da3b9 100644
--- a/ACE/apps/drwho/CM_Client.cpp
+++ b/ACE/apps/drwho/CM_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Multicast_Manager.h"
#include "CM_Client.h"
diff --git a/ACE/apps/drwho/CM_Server.cpp b/ACE/apps/drwho/CM_Server.cpp
index 5cca27910fc..8062a305baa 100644
--- a/ACE/apps/drwho/CM_Server.cpp
+++ b/ACE/apps/drwho/CM_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#include "Options.h"
#include "CM_Server.h"
diff --git a/ACE/apps/drwho/Comm_Manager.cpp b/ACE/apps/drwho/Comm_Manager.cpp
index bb8e2ee1cb2..9527bf8557e 100644
--- a/ACE/apps/drwho/Comm_Manager.cpp
+++ b/ACE/apps/drwho/Comm_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Comm_Manager.h"
Comm_Manager::~Comm_Manager (void)
diff --git a/ACE/apps/drwho/Drwho_Node.cpp b/ACE/apps/drwho/Drwho_Node.cpp
index ab3b66b93f9..1786b89f13d 100644
--- a/ACE/apps/drwho/Drwho_Node.cpp
+++ b/ACE/apps/drwho/Drwho_Node.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Drwho_Node.h"
Drwho_Node::Drwho_Node (const char *h_name, Drwho_Node *n)
diff --git a/ACE/apps/drwho/File_Manager.cpp b/ACE/apps/drwho/File_Manager.cpp
index 1a4d90b941f..2edfde45bc9 100644
--- a/ACE/apps/drwho/File_Manager.cpp
+++ b/ACE/apps/drwho/File_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_pwd.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/drwho/HT_Client.cpp b/ACE/apps/drwho/HT_Client.cpp
index 0d3641382cd..323939372b0 100644
--- a/ACE/apps/drwho/HT_Client.cpp
+++ b/ACE/apps/drwho/HT_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HT_Client.h"
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/drwho/HT_Server.cpp b/ACE/apps/drwho/HT_Server.cpp
index cf52d0804ca..8c79e9762d1 100644
--- a/ACE/apps/drwho/HT_Server.cpp
+++ b/ACE/apps/drwho/HT_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HT_Server.h"
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/drwho/Hash_Table.cpp b/ACE/apps/drwho/Hash_Table.cpp
index eb319caa29b..b548056acbd 100644
--- a/ACE/apps/drwho/Hash_Table.cpp
+++ b/ACE/apps/drwho/Hash_Table.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Hash_Table.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/Multicast_Manager.cpp b/ACE/apps/drwho/Multicast_Manager.cpp
index 8606138aa59..fefc4e854ec 100644
--- a/ACE/apps/drwho/Multicast_Manager.cpp
+++ b/ACE/apps/drwho/Multicast_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multicast_Manager.h"
#include "ace/Mem_Map.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/Options.cpp b/ACE/apps/drwho/Options.cpp
index 33d1263daee..8984f52a628 100644
--- a/ACE/apps/drwho/Options.cpp
+++ b/ACE/apps/drwho/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdlib.h"
#include "ace/Get_Opt.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/PMC_All.cpp b/ACE/apps/drwho/PMC_All.cpp
index 5853051866d..4549b0bd32f 100644
--- a/ACE/apps/drwho/PMC_All.cpp
+++ b/ACE/apps/drwho/PMC_All.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#include "Options.h"
#include "HT_Client.h"
diff --git a/ACE/apps/drwho/PMC_Flo.cpp b/ACE/apps/drwho/PMC_Flo.cpp
index 2723e715100..549b8156f1c 100644
--- a/ACE/apps/drwho/PMC_Flo.cpp
+++ b/ACE/apps/drwho/PMC_Flo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "BS_Client.h"
#include "PMC_Flo.h"
diff --git a/ACE/apps/drwho/PMC_Ruser.cpp b/ACE/apps/drwho/PMC_Ruser.cpp
index b969622f8e2..c5fb1c67eac 100644
--- a/ACE/apps/drwho/PMC_Ruser.cpp
+++ b/ACE/apps/drwho/PMC_Ruser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#include "Options.h"
#include "HT_Client.h"
diff --git a/ACE/apps/drwho/PMC_Usr.cpp b/ACE/apps/drwho/PMC_Usr.cpp
index 6ccbf4ffba2..38793b293c0 100644
--- a/ACE/apps/drwho/PMC_Usr.cpp
+++ b/ACE/apps/drwho/PMC_Usr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "SL_Client.h"
#include "PMC_Usr.h"
diff --git a/ACE/apps/drwho/PMS_All.cpp b/ACE/apps/drwho/PMS_All.cpp
index db9eb75703b..715af0501af 100644
--- a/ACE/apps/drwho/PMS_All.cpp
+++ b/ACE/apps/drwho/PMS_All.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "HT_Server.h"
#include "PMS_All.h"
diff --git a/ACE/apps/drwho/PMS_Flo.cpp b/ACE/apps/drwho/PMS_Flo.cpp
index 5bc9e2a59e3..9d51bf856b9 100644
--- a/ACE/apps/drwho/PMS_Flo.cpp
+++ b/ACE/apps/drwho/PMS_Flo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "BS_Server.h"
#include "PMS_Flo.h"
diff --git a/ACE/apps/drwho/PMS_Ruser.cpp b/ACE/apps/drwho/PMS_Ruser.cpp
index 815186b409f..a20b8899e2f 100644
--- a/ACE/apps/drwho/PMS_Ruser.cpp
+++ b/ACE/apps/drwho/PMS_Ruser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "HT_Server.h"
#include "PMS_Ruser.h"
diff --git a/ACE/apps/drwho/PMS_Usr.cpp b/ACE/apps/drwho/PMS_Usr.cpp
index 7aa4a99829d..fb9eb0ed387 100644
--- a/ACE/apps/drwho/PMS_Usr.cpp
+++ b/ACE/apps/drwho/PMS_Usr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "SL_Server.h"
#include "PMS_Usr.h"
diff --git a/ACE/apps/drwho/PM_Client.cpp b/ACE/apps/drwho/PM_Client.cpp
index d794db28e78..623ac65f634 100644
--- a/ACE/apps/drwho/PM_Client.cpp
+++ b/ACE/apps/drwho/PM_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "PM_Server.h"
#include "PM_Client.h"
diff --git a/ACE/apps/drwho/PM_Server.cpp b/ACE/apps/drwho/PM_Server.cpp
index f3068fa45df..8dd7249fb99 100644
--- a/ACE/apps/drwho/PM_Server.cpp
+++ b/ACE/apps/drwho/PM_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Rwho_DB_Manager.h"
#include "PM_Server.h"
diff --git a/ACE/apps/drwho/Protocol_Manager.cpp b/ACE/apps/drwho/Protocol_Manager.cpp
index dd2f1dc1afa..1d9bfc6d723 100644
--- a/ACE/apps/drwho/Protocol_Manager.cpp
+++ b/ACE/apps/drwho/Protocol_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-all.h"
#include "ace/Log_Msg.h"
#include "ace/OS_Memory.h"
diff --git a/ACE/apps/drwho/Protocol_Record.cpp b/ACE/apps/drwho/Protocol_Record.cpp
index db2c7a8276b..7190b7bd777 100644
--- a/ACE/apps/drwho/Protocol_Record.cpp
+++ b/ACE/apps/drwho/Protocol_Record.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Protocol_Record.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/Rwho_DB_Manager.cpp b/ACE/apps/drwho/Rwho_DB_Manager.cpp
index cbff70bfb20..4910da3f0f7 100644
--- a/ACE/apps/drwho/Rwho_DB_Manager.cpp
+++ b/ACE/apps/drwho/Rwho_DB_Manager.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "global.h"
#include "Options.h"
#include "Rwho_DB_Manager.h"
diff --git a/ACE/apps/drwho/SL_Client.cpp b/ACE/apps/drwho/SL_Client.cpp
index 9cba5324a2e..c92b576fce2 100644
--- a/ACE/apps/drwho/SL_Client.cpp
+++ b/ACE/apps/drwho/SL_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "SL_Client.h"
diff --git a/ACE/apps/drwho/SL_Server.cpp b/ACE/apps/drwho/SL_Server.cpp
index 7dc172deb08..06fe054eb5b 100644
--- a/ACE/apps/drwho/SL_Server.cpp
+++ b/ACE/apps/drwho/SL_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global.h"
#include "SL_Server.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/drwho/SML_Client.cpp b/ACE/apps/drwho/SML_Client.cpp
index 8ae0195e1a6..f4d46e59bfe 100644
--- a/ACE/apps/drwho/SML_Client.cpp
+++ b/ACE/apps/drwho/SML_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "SML_Client.h"
diff --git a/ACE/apps/drwho/SML_Server.cpp b/ACE/apps/drwho/SML_Server.cpp
index 5a71c795f69..65dbcd9ef2d 100644
--- a/ACE/apps/drwho/SML_Server.cpp
+++ b/ACE/apps/drwho/SML_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SML_Server.h"
SML_Server::SML_Server (void)
diff --git a/ACE/apps/drwho/SMR_Client.cpp b/ACE/apps/drwho/SMR_Client.cpp
index 0020b8b1e3c..84852dc64af 100644
--- a/ACE/apps/drwho/SMR_Client.cpp
+++ b/ACE/apps/drwho/SMR_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "PMC_All.h"
#include "PMC_Flo.h"
diff --git a/ACE/apps/drwho/SMR_Server.cpp b/ACE/apps/drwho/SMR_Server.cpp
index 0801e0e1db1..ecec25c1c10 100644
--- a/ACE/apps/drwho/SMR_Server.cpp
+++ b/ACE/apps/drwho/SMR_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "SMR_Server.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/SM_Client.cpp b/ACE/apps/drwho/SM_Client.cpp
index a7cab2eaa04..9a7545f5e68 100644
--- a/ACE/apps/drwho/SM_Client.cpp
+++ b/ACE/apps/drwho/SM_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "PMC_All.h"
#include "PMC_Flo.h"
diff --git a/ACE/apps/drwho/SM_Server.cpp b/ACE/apps/drwho/SM_Server.cpp
index 16ef5f1dea1..5c7271c2474 100644
--- a/ACE/apps/drwho/SM_Server.cpp
+++ b/ACE/apps/drwho/SM_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "PMS_All.h"
#include "PMS_Flo.h"
diff --git a/ACE/apps/drwho/Search_Struct.cpp b/ACE/apps/drwho/Search_Struct.cpp
index 79d3848b5c9..33491396ee1 100644
--- a/ACE/apps/drwho/Search_Struct.cpp
+++ b/ACE/apps/drwho/Search_Struct.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Search_Struct.h"
#include "ace/Log_Msg.h"
diff --git a/ACE/apps/drwho/Select_Manager.cpp b/ACE/apps/drwho/Select_Manager.cpp
index 0570649500e..6ac3cd75b8f 100644
--- a/ACE/apps/drwho/Select_Manager.cpp
+++ b/ACE/apps/drwho/Select_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Select_Manager.h"
diff --git a/ACE/apps/drwho/Single_Lookup.cpp b/ACE/apps/drwho/Single_Lookup.cpp
index e3e893f389f..57c33772bf2 100644
--- a/ACE/apps/drwho/Single_Lookup.cpp
+++ b/ACE/apps/drwho/Single_Lookup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options.h"
#include "Single_Lookup.h"
#include "ace/ACE.h"
diff --git a/ACE/apps/drwho/drwho.mpc b/ACE/apps/drwho/drwho.mpc
index 489c125b2ea..aade6b2419f 100644
--- a/ACE/apps/drwho/drwho.mpc
+++ b/ACE/apps/drwho/drwho.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*-client) : aceexe {
requires += rwho
avoids += uses_wchar ace_for_tao
diff --git a/ACE/apps/gperf/ace_gperf.mpc b/ACE/apps/gperf/ace_gperf.mpc
index 723534c7157..080615e28d4 100644
--- a/ACE/apps/gperf/ace_gperf.mpc
+++ b/ACE/apps/gperf/ace_gperf.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (gperf_docs) : man {
Man_Files {
ace_gperf.1
diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc
index 4d5babe6b2b..1f29eff82a1 100644
--- a/ACE/apps/gperf/src/gperf.mpc
+++ b/ACE/apps/gperf/src/gperf.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(gperf) : aceexe, install, crosscompile {
install = $(ACE_ROOT)/bin
exename = ace_gperf
diff --git a/ACE/apps/gperf/tests/test.cpp b/ACE/apps/gperf/tests/test.cpp
index ba78028f00a..32f7240c200 100644
--- a/ACE/apps/gperf/tests/test.cpp
+++ b/ACE/apps/gperf/tests/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Tests the generated perfect hash function.
// The -v option prints diagnostics as to whether a word is in the set
diff --git a/ACE/apps/gperf/tests/tests.mpc b/ACE/apps/gperf/tests/tests.mpc
index f5ea29989fe..53ccfc82dcd 100644
--- a/ACE/apps/gperf/tests/tests.mpc
+++ b/ACE/apps/gperf/tests/tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(cinset): gperf_test {
exename = cout
diff --git a/ACE/apps/mkcsregdb/mkcsregdb.mpc b/ACE/apps/mkcsregdb/mkcsregdb.mpc
index ba2f017395b..4138a13803f 100644
--- a/ACE/apps/mkcsregdb/mkcsregdb.mpc
+++ b/ACE/apps/mkcsregdb/mkcsregdb.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: aceexe {
exename = mkcsregdb
avoids += uses_wchar
diff --git a/ACE/apps/soreduce/Library.cpp b/ACE/apps/soreduce/Library.cpp
index 84c604ef6e6..26a42421dcd 100644
--- a/ACE/apps/soreduce/Library.cpp
+++ b/ACE/apps/soreduce/Library.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: Library.cpp
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Library.h b/ACE/apps/soreduce/Library.h
index af978c61f74..0c6f0ab0e3b 100644
--- a/ACE/apps/soreduce/Library.h
+++ b/ACE/apps/soreduce/Library.h
@@ -3,8 +3,6 @@
#define _LIBRARY_H_
// -*- C++ -*-
-// $Id$
-
// File: Library.h
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Obj_Module.cpp b/ACE/apps/soreduce/Obj_Module.cpp
index ca2d6eac8d1..75fe1ce38a5 100644
--- a/ACE/apps/soreduce/Obj_Module.cpp
+++ b/ACE/apps/soreduce/Obj_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: Obj_Module.cpp
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Obj_Module.h b/ACE/apps/soreduce/Obj_Module.h
index f03a3c392c0..4c8e0199031 100644
--- a/ACE/apps/soreduce/Obj_Module.h
+++ b/ACE/apps/soreduce/Obj_Module.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: Obj_Module.h
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/SO_Group.cpp b/ACE/apps/soreduce/SO_Group.cpp
index c683550926d..5bd30c4ae8c 100644
--- a/ACE/apps/soreduce/SO_Group.cpp
+++ b/ACE/apps/soreduce/SO_Group.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: SO_Group.cpp
#include "ace/OS_NS_string.h"
diff --git a/ACE/apps/soreduce/SO_Group.h b/ACE/apps/soreduce/SO_Group.h
index df4723a5905..24b9ba20e0b 100644
--- a/ACE/apps/soreduce/SO_Group.h
+++ b/ACE/apps/soreduce/SO_Group.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: SO_Group.h
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Sig_List.cpp b/ACE/apps/soreduce/Sig_List.cpp
index 9f109c8ca08..e7b8bf01dfe 100644
--- a/ACE/apps/soreduce/Sig_List.cpp
+++ b/ACE/apps/soreduce/Sig_List.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// File: Sig_List.cpp
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Sig_List.h b/ACE/apps/soreduce/Sig_List.h
index bd85974451e..e0450bf2680 100644
--- a/ACE/apps/soreduce/Sig_List.h
+++ b/ACE/apps/soreduce/Sig_List.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: Sig_List.h
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/Signature.cpp b/ACE/apps/soreduce/Signature.cpp
index 89f9d413218..94063127e4e 100644
--- a/ACE/apps/soreduce/Signature.cpp
+++ b/ACE/apps/soreduce/Signature.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Signature.h"
Signature::Signature (const ACE_CString &name)
diff --git a/ACE/apps/soreduce/Signature.h b/ACE/apps/soreduce/Signature.h
index 189a430543a..f2be8aaae1f 100644
--- a/ACE/apps/soreduce/Signature.h
+++ b/ACE/apps/soreduce/Signature.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// File: Signature.h
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/soreduce.cpp b/ACE/apps/soreduce/soreduce.cpp
index d2005b34c15..fbcc50d86fc 100644
--- a/ACE/apps/soreduce/soreduce.cpp
+++ b/ACE/apps/soreduce/soreduce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// File: soreduce.cpp
// Author: Phil Mesnier
diff --git a/ACE/apps/soreduce/soreduce.mpc b/ACE/apps/soreduce/soreduce.mpc
index 2fe7cc27101..4a7683296b6 100644
--- a/ACE/apps/soreduce/soreduce.mpc
+++ b/ACE/apps/soreduce/soreduce.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(soreduce) : aceexe {
avoids += uses_wchar ace_for_tao
exename = soreduce