summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp3
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h3
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h3
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc3
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp3
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h3
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h2
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp3
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h3
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_i.h3
-rw-r--r--TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP.mpc3
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Supplier.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP.mpc3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Security.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityAdmin.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel1.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel2.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.inl3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h3
-rw-r--r--TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc3
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server_i.h3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h3
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp3
211 files changed, 0 insertions, 624 deletions
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
index e46fd5a879f..cd9f4219370 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index d1ca7a43407..c31b60764eb 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
//=============================================================================
/**
* @file FT_Notifier_i.h
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index d290fadd236..a64e2292b94 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_IMR_ACTIVATOR_LOADER_H
#define TAO_IMR_ACTIVATOR_LOADER_H
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 0489ab6d38e..31735821a36 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_IMR_LOCATOR_LOADER_H
#define TAO_IMR_LOCATOR_LOADER_H
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index b918d058ea9..3ba6535f795 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(LoadManager): namingexe, portableserver, install, iortable, iormanip, loadbalancing, svc_utils {
exename = tao_loadmanager
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index 08b0dfec2da..a98e8540d7e 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Country_i.h"
// Implementation skeleton constructor
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index a1ba3fe3826..8a06018ff12 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COUNTRYI_H_
#define COUNTRYI_H_
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
index 9fd7218042f..5e200d12f7b 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#include "Manager_i.h"
Manager_i::Manager_i (long retryCount)
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
index 9a5bca21ed9..b1824922771 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef MANAGERI_H_
#define MANAGERI_H_
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
index c38e3e84944..d57009c00f7 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Messenger_i.h"
#include <ace/streams.h>
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
index 6236bd7b976..8991eda73bc 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index eb850120dea..3a3889856df 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef GATEWAY_OBJREF_FACTORY_H
#define GATEWAY_OBJREF_FACTORY_H
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index 9f9ccaee9d0..081dee4ed14 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file Gateway_i.h
diff --git a/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl b/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
index 0b7c8d10bee..61097eb7680 100644
--- a/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
+++ b/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef OBJECT_REFERENCE_FACTORY_IDL
#define OBJECT_REFERENCE_FACTORY_IDL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
index 58589d94052..fb5072ec91d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
index b31d7cb8436..bf8bb0e2f6b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_strings.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.inl b/TAO/orbsvcs/orbsvcs/AV/MCast.inl
index 08d994f23ed..6587ee4a5b0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.inl b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
index 3ff570e0e6f..54793355891 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//--------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
index 1d3d82363c8..2961bdac0d5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//----------------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.inl b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
index c05c2474e2b..7c78c72c1f8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.inl b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
index 72025b94dd5..d28ab71bde8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.inl
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//----------------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl
index 3c21f6c9bb2..3bf0741999b 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class TARGET> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
index e98ce75077c..37a0e5da720 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
index 0dd3d37f8cb..c33f0c7672f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
index 1432528492a..7384f969a4c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index 327946feb17..78ab05ce1d2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h"
#include "tao/DynamicInterface/Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
index 2f1bff715f7..b7786d5f6b5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
index 23f8e906f7c..b17aaa32ddc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
index 3c22bfb9af4..67bb6e354ef 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
index 8519794c295..96c4591583e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
index 422c95863c6..0f865f9b440 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
index 9f92df16b06..79be8659d44 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
index cd61d83efce..73a97a3e6bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
index c48ec1202d6..936348a1fec 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
index e166f46ecf6..a3ca36449b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
index 991386a0370..d9283474ce4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index a3c54a527b5..816f9893014 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
index 1a03d37ce61..85ae52b238b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
index 477dd349409..6783d5c3b63 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
index 4c8f0aab997..f5897f1f124 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index f8d0efa129d..ef0bd7613c9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
index 51680d76464..145340dc989 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 0defb881764..74b83b68e39 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
index 86eee941060..c42ee7ad6ec 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
index 0ef62fc3cfa..c66137e23f9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 9cd821e7bf3..88506cad928 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(CosNaming_Serv) : cosnaming_serv_persistence, orbsvcslib, orbsvcs_output, install, naming_skel, messaging_optional, svc_utils, iortable {
sharedname = TAO_CosNaming_Serv
dynamicflags += TAO_NAMING_SERV_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
index 8c39a00c2e9..66ff6a897c1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
index d3ad3d108c7..39f67a9b21f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class COLLECTION, class ITERATOR> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index c042ea793c5..55fee94e3e6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
index 3ffe5697959..f4a0463c759 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class Target, class Object>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index 6e49c5a1506..3dc79d8bdd7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Guard_T.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
index 02201bde5d5..f4db003bb3f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class P, class R>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
index f44945d45bf..363b66c3dc6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class EC,class P,class I> ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
index 67d752fdc6c..5178a5a2a41 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
index b67178bf7b5..993cda700a7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class PROXY> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
index d0d4fc80ac1..2c4b679bb3b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class EC, class P> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
index ad9d4618f24..590b187dae9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
index 51955993b3d..416d6e7dd6f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class PROXY> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
index 078166a6088..ac3b70296da 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
index f754037692f..0508e402fb3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Null_Mutex.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
index bafa73ad26f..99897005857 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE PortableServer::Servant_var<TAO_ECG_Complex_Address_Server>
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 109d5104934..332d4f0d465 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
index 8dfc144f82c..1b18f69c414 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
index b8ed7f25560..833ca1df6bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE PortableServer::Servant_var<TAO_ECG_Simple_Address_Server>
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
index d84f70937b8..43231a83b01 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_SOCK_Dgram&
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
index 4fd78c8df74..331d9ac2bdf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_time.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index a913c696385..6b6aec4d55c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index 99ab17a08c5..57d16eefb3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Null_Mutex.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
index ebf53c20045..806244e8ccc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
index 670ad09dd63..28557cdabb7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
index 2564cd3b0c5..75498ef3164 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
index 37930e408fe..ef6d7dc0d83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
index 1883f84ef11..fba3bc42726 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
index a5b9e121522..562eef64822 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
index 89d32fe656e..6a2b2f859fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
index 45dbd3f9d3f..badb7966c3a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
index 0c116874fad..626d503dfa7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
index 7119373733f..99852966866 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
index 8e0cd624a7e..e73de1bee85 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
index 1afeb35fa05..6858f106f1e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index 87b31282a2d..39b6a165cea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index 34a3123876b..746174798a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class T>
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
index 231db3f9417..c30de3be660 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
index 4c950811fcc..79acd922f83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
index c4ddf4074b0..3a9b2c47159 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
index 2de353d965e..953b469c46f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
index 6eada65b541..fce2b690b8c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index ae28f7d1ccd..7ed19308c8f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
index eab42f031bc..e1ee9410d4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
index d365ca2ae4d..22a20cdd0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
index 3ffaf226464..d55f6c71303 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
index 84cbe2d4a4d..707e9dbd4e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
index a00dfd725c5..5b238a0462e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
index 9b09afb3d74..efbf50dfabc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
index 0ef108f34d2..0ebd2896c7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
index a6e30773801..4e49106469c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const TAO_EC_QOS_Info&
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
index aba1263d609..9b8c73a7755 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
index 20c09b0a0fe..23ec7c5559d 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index e0d60d7d4ce..ac9edd8cd7a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_FTRTEC {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
index cb4f454a70f..2d9cd2198a3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
index a4712c153f5..3f4ee1a270e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_Memory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
index 0a7a87bc9b9..131e87c866c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_FtRt
{
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.idl b/TAO/orbsvcs/orbsvcs/HTIOP.idl
index 925c5702861..ea38de61c96 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.idl
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef HTIOP_IDL
#define HTIOP_IDL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 8a0fce63520..67fc0f96766 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project : htbp, orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_HTIOP
idlflags += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
index 6b3279c0c04..a7d7eb06e2d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE::HTBP::Addr&
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
index dffd4f6705b..a310cd3b769 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE::HTBP::Addr &
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
index 6c68ed57ce5..41cdc6e649a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
index abff1d3087e..f4bc3ae49c6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
index 2ea4c81ca02..121843e29f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Float
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
index 638e704525b..4d8296efa92 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Float
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
index d7cb523081e..12e1b5af3fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index bc93ae89184..c6be9762948 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const TAO_Notify_Property_Long&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index 7770744c722..474fe1e0229 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
index bec2898f951..5a1c4a268cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class TYPE> ACE_INLINE typename TAO_Notify_Container_T<TYPE>::COLLECTION*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
index a34687b5c64..513c55ea21c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 0c4a6d287e4..13215cceee2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const TAO_Notify_Property_Short&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
index d0a5fded1a5..579d009d734 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE u_long
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
index d80a33201e3..b472c831377 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class PROXY> ACE_INLINE typename
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index e2859f9c93b..9332d886ace 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class PROXY, class ACE_LOCK> ACE_INLINE TAO_Notify_Event_Map_Entry_T<PROXY>*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
index 802f0c5e6e5..85c89a6f72e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
index 6aa178a4421..331851c2d48 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Notify_Object::ID
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 272b3320799..7c185eca11d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/debug.h"
#include "orbsvcs/Notify/Peer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 5b812581625..40354be0e8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Long
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
index dc559fb00c4..8679b91e6e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index 62fb4db7e6b..75072336efc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Notify_Factory*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
index 043f28ab9b6..3fdb5290aad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
index bccd42bed59..589012eace3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Notify_Property_Boolean&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index 7f66d30c0c0..df92df49e9c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE> ACE_INLINE const TYPE&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 9746aa848cb..f8f1b5da453 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
index b2b0c8bb5c8..1449e61150c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
index c7afa257d59..753d2626dad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
index 6cf7f8f44fa..2a0637c73d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
index 71fae93e7ba..3316151861f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE RTCORBA::RTORB_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
index d2b6ec811e5..cc4ef7e45c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Notify_Buffering_Strategy*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
index 4ab55e0b75f..874c8d31942 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Log_Msg.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
index a3e0ab45685..dd7a6df21c9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<class TYPE> ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
index 19d48fb5634..e1b2c45f8c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Notify_ProxyConsumer*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
index b3d7ef8c054..024c8483f0e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl
index 0cb2424d222..70ca15fd861 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_PG
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
index 052d968242b..445e7d4e865 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
index a0b591b1068..8c266b4aff9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
index ec296d0f9b6..3c40a4ca1dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
index b33e05ec5ea..32861f9f6c0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_INET_Addr &
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.idl b/TAO/orbsvcs/orbsvcs/SSLIOP.idl
index ec682b1cd4d..34841c39603 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.idl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
// File: SSLIOP.idl
// Part of the Security Service with additions from the Firewall
// specification.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index c55a282b0b6..30e99c0ffa4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(SSLIOP) : orbsvcslib, orbsvcs_output, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults, ssliop_params_dup, svc_utils {
sharedname = TAO_SSLIOP
idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
index 7a0b3d4b320..667237bbdac 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
index 9dd630f54ef..ed65fecb083 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
index 193fc62f426..55ac19b0d06 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
index 42970eb800f..df5f0ced92c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ::X509 *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
index 1584b919606..870554d3e0d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
index d1f4b91ee81..6e09aa4eba8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
index 9ea9beb96b6..05f856207cb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
index f52a511c417..86d26e48bbd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// This is needed on LynxOS 4.0 with GCC 2.95
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl
index ac0a30b7b71..54b418517c7 100644
--- a/TAO/orbsvcs/orbsvcs/Security.idl
+++ b/TAO/orbsvcs/orbsvcs/Security.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef _SECURITY_IDL_
#define _SECURITY_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
index 4194ffe1895..1553ccaeb93 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
index eee8c6c11fe..04fe1c19fe3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE size_t
diff --git a/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl b/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl
index f215aa6868b..a8fe9cea9cb 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityAdmin.idl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifdef _SECURITY_ADMIN_IDL_
#define _SECURITY_ADMIN_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
index c271999989f..ea1751a2d8c 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef _SECURITY_LEVEL_1_IDL_
#define _SECURITY_LEVEL_1_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
index 3d08e546b21..71f8c838f00 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef _SECURITY_LEVEL_2_IDL_
#define _SECURITY_LEVEL_2_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
index c7beeefd060..f7b40116bd7 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
@@ -1,7 +1,4 @@
// -*- IDL -*-
-//
-// $Id$
-
#ifndef _SECURITY_REPLACEABLE_IDL_
#define _SECURITY_REPLACEABLE_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.inl b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.inl
index 55e9f324410..d0e81696338 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.inl
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index 7d7b6642a99..c47830f82ad 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index 7d7b6642a99..c47830f82ad 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index c6d4c104dcc..03d34cf3108 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequest_Interceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index 7aff46ebb9d..b23cba1c322 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer2.h"
#include "ServerRequest_Interceptor2.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index df3b9bad0f6..5becd14b268 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer2.h"
#include "ServerRequest_Interceptor2.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index 28c65bdca2b..df9db17965f 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer2.h"
#include "ServerRequest_Interceptor2.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
index 6d33ff19052..bcbbebb7f2d 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer2.h"
#include "ServerRequest_Interceptor2.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 78df0a897f3..9c9670f5b46 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequest_Interceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ClientORBInitializer.h"
void
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
index 4d7be111da0..f4bdbbf8f0c 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 1a547dd5d5a..546c0361c90 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ReplicationManagerFaultConsumerAdapter.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index f4975b0497b..68a21e1c5ef 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H
#define REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H
#include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 70ccfbf26f6..249072b8085 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "StubBatchConsumer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index e38d27d010e..aedc1a399cb 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef STUBBATCHCONSUMER_H
#define STUBBATCHCONSUMER_H
#include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 2b8903ed3d3..5541c294eaa 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "StubFaultAnalyzer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 4f2ea3cf2d9..424ca9315b1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef STUBFAULTANALYZER_H
#define STUBFAULTANALYZER_H
#include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 2aa86ed70b9..079559f73ee 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "StubFaultConsumer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 67f4f0dea81..9845df441d0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef STUBFAULTCONSUMER_H
#define STUBFAULTCONSUMER_H
#include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index e51a9eacf59..6beb80cdb60 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "StubFaultNotifier.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 8822194e8f5..c1ded566c7f 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
#ifndef STUBFAULTNOTIFIER_H_
#define STUBFAULTNOTIFIER_H_
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
index 1664eddc322..bbb473fe9c7 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BASIC_H
#define BASIC_H
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
index 21d10f6644c..687fa64cca8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
#include "orbsvcs/FT_NamingManager.idl"
/// Put the interfaces in a module, to avoid global namespace pollution
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
index 37aec36f681..81884559d55 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BASIC_H
#define BASIC_H
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
index 21d10f6644c..687fa64cca8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
#include "orbsvcs/FT_NamingManager.idl"
/// Put the interfaces in a module, to avoid global namespace pollution
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
index da9a196f72f..1b39951d65d 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index f153c453cde..bfd0b44531a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
index b09077d66c7..3775912ef8f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sa -St
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 84aeb82e37e..278511cb33f 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef SERVER_I_H
#define SERVER_I_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
index 934b92a2264..8c2a9bdc62a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
index 3c6d45a1b75..9b28828dbdb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*): taoclient, ifr_client {
Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index 0faeabc2c03..d32c97df594 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.5a_p8 ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index e3e10eea60e..84cfb593ad6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TESTIMPL_H_
#define TESTIMPL_H_
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index d9a02338230..105a8bcc551 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BASIC_H
#define BASIC_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl
index 0c9a380b07c..51074c0ebe0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
index c9af47702c2..0d239e82e8f 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BASIC_H
#define BASIC_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl
index 25065f3c3e1..924263a4704 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
index cedab2b655b..d0191e7f336 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef FACTORY_H
#define FACTORY_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
index 87df1062797..a8baa790ca6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef FACTORY_MAP_H
#define FACTORY_MAP_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
index 39b02503054..0e79be4b7c6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef SIMPLE_H
#define SIMPLE_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl
index 99a9521e595..7534755bd97 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 7ad15cded9f..075283b4610 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef FACTORY_H
#define FACTORY_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
index 87df1062797..a8baa790ca6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef FACTORY_MAP_H
#define FACTORY_MAP_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 12eccd1512d..129c11dc3c1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef SIMPLE_H
#define SIMPLE_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl
index 4c0f00b66a1..2e0303544b4 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index b53ae03f1a7..361c5a9e9c3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BASIC_H
#define BASIC_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index c21ff402b60..42a1e609843 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef SIMPLE_H
#define SIMPLE_H
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl
index 25e2829b394..763f8f6a78e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
index 79032e33f6f..a57494d613d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef MT_BIDIR_RECEIVER_H
#define MT_BIDIR_RECEIVER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
index 42686741b21..3a34b55d44c 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef MT_BIDIR_SERVER_TASK_H
#define MT_BIDIR_SERVER_TASK_H
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 1d7af9b5648..7fc392022de 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Foo_i.h"