summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp3
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h3
-rw-r--r--TAO/examples/Simple/time-date/Time_Date.h3
-rw-r--r--TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/client_interceptor.h3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/server_interceptor.h3
-rw-r--r--TAO/interop-tests/wchar/interop_wchar_i.cpp3
-rw-r--r--TAO/interop-tests/wchar/interop_wchar_i.h3
-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
-rw-r--r--TAO/tao/Acceptor_Registry.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any_Impl_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Fixed_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/NVList.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/True_RefCount_Policy.inl3
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl3
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_T.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Typecode_typesA.h3
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode.inl3
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl3
-rw-r--r--TAO/tao/AnyTypeCode/WrongTransactionA.cpp3
-rw-r--r--TAO/tao/AnyTypeCode/WrongTransactionA.h3
-rw-r--r--TAO/tao/Asynch_Reply_Dispatcher_Base.inl3
-rw-r--r--TAO/tao/BD_String_Argument_T.inl3
-rw-r--r--TAO/tao/Base_Transport_Property.h3
-rw-r--r--TAO/tao/Base_Transport_Property.inl3
-rw-r--r--TAO/tao/Basic_Argument_T.inl3
-rw-r--r--TAO/tao/Bind_Dispatcher_Guard.inl3
-rw-r--r--TAO/tao/CDR.inl3
-rw-r--r--TAO/tao/CORBALOC_Parser.inl3
-rw-r--r--TAO/tao/CORBA_String.inl3
-rw-r--r--TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl3
-rw-r--r--TAO/tao/CSD_Framework/CSD_POA.inl3
-rw-r--r--TAO/tao/CSD_Framework/CSD_Strategy_Base.inl3
-rw-r--r--TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl3
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl3
-rw-r--r--TAO/tao/Cache_Entries_T.inl3
-rw-r--r--TAO/tao/Cleanup_Func_Registry.inl3
-rw-r--r--TAO/tao/Connection_Purging_Strategy.inl3
-rw-r--r--TAO/tao/Connector_Registry.inl3
-rw-r--r--TAO/tao/DynamicAny/DynAnyFactory.h3
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynValueBox_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynValueCommon_i.h3
-rw-r--r--TAO/tao/DynamicAny/DynValue_i.h3
-rw-r--r--TAO/tao/DynamicInterface/Context.inl3
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments.inl3
-rw-r--r--TAO/tao/DynamicInterface/ExceptionList.inl3
-rw-r--r--TAO/tao/DynamicInterface/Request.inl3
-rw-r--r--TAO/tao/DynamicInterface/Server_Request.inl3
-rw-r--r--TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl3
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Task.inl3
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl3
-rw-r--r--TAO/tao/Endpoint.inl3
-rw-r--r--TAO/tao/Environment.inl3
-rw-r--r--TAO/tao/Exception.inl3
-rw-r--r--TAO/tao/Fixed_Array_Argument_T.inl3
-rw-r--r--TAO/tao/Fixed_Size_Argument_T.inl3
-rw-r--r--TAO/tao/IIOP_Acceptor.inl3
-rw-r--r--TAO/tao/IIOP_Endpoint.inl3
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.inl3
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Base_T.inl3
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Handle_T.inl3
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Object_T.inl3
-rw-r--r--TAO/tao/Invocation_Adapter.inl3
-rw-r--r--TAO/tao/Invocation_Base.inl3
-rw-r--r--TAO/tao/Invocation_Retry_Params.cpp3
-rw-r--r--TAO/tao/Invocation_Retry_State.cpp3
-rw-r--r--TAO/tao/LF_Event.inl3
-rw-r--r--TAO/tao/LF_Event_Binder.inl3
-rw-r--r--TAO/tao/LF_Event_Loop_Thread_Helper.inl3
-rw-r--r--TAO/tao/LF_Follower.inl3
-rw-r--r--TAO/tao/LF_Follower_Auto_Ptr.inl3
-rw-r--r--TAO/tao/Leader_Follower.inl3
-rw-r--r--TAO/tao/LocalObject.inl3
-rw-r--r--TAO/tao/MCAST_Parser.inl3
-rw-r--r--TAO/tao/Messaging/Buffering_Constraint_Policy.inl3
-rw-r--r--TAO/tao/Messaging/Messaging_Policy_i.inl3
-rw-r--r--TAO/tao/ORB.inl3
-rw-r--r--TAO/tao/ORB_Core.inl3
-rw-r--r--TAO/tao/ORB_Core_Auto_Ptr.inl3
-rw-r--r--TAO/tao/ORB_Table.inl3
-rw-r--r--TAO/tao/ORB_Time_Policy.inl3
-rw-r--r--TAO/tao/Object.inl3
-rw-r--r--TAO/tao/Object_Argument_T.inl3
-rw-r--r--TAO/tao/Object_KeyC.cpp3
-rw-r--r--TAO/tao/Object_KeyC.h3
-rw-r--r--TAO/tao/Object_Ref_Table.inl3
-rw-r--r--TAO/tao/Objref_VarOut_T.inl3
-rw-r--r--TAO/tao/PI/ClientRequestDetails.inl3
-rw-r--r--TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl3
-rw-r--r--TAO/tao/PI/ORBInitInfo.inl3
-rw-r--r--TAO/tao/PI/PICurrent.inl3
-rw-r--r--TAO/tao/PI/PICurrent_Impl.inl3
-rw-r--r--TAO/tao/PI/PolicyFactoryA.cpp3
-rw-r--r--TAO/tao/PI/PolicyFactoryA.h3
-rw-r--r--TAO/tao/PI/PolicyFactoryC.cpp3
-rw-r--r--TAO/tao/PI/PolicyFactoryC.h3
-rw-r--r--TAO/tao/PI/PolicyFactoryS.h3
-rw-r--r--TAO/tao/PI_Server/ServerRequestDetails.inl3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInfo.inl3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptorA.cpp3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptorA.h3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptorC.cpp3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptorC.h3
-rw-r--r--TAO/tao/PI_Server/ServerRequestInterceptorS.h3
-rw-r--r--TAO/tao/Parser_Registry.inl3
-rw-r--r--TAO/tao/Policy_Current.inl3
-rw-r--r--TAO/tao/Policy_Current_Impl.inl3
-rw-r--r--TAO/tao/Policy_Manager.inl3
-rw-r--r--TAO/tao/Policy_Set.inl3
-rw-r--r--TAO/tao/PortableServer/Active_Object_Map.inl3
-rw-r--r--TAO/tao/PortableServer/Active_Policy_Strategies.inl3
-rw-r--r--TAO/tao/PortableServer/BD_String_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Basic_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Creation_Time.inl3
-rw-r--r--TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Non_Servant_Upcall.inl3
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.inl3
-rw-r--r--TAO/tao/PortableServer/Object_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/POAManager.inl3
-rw-r--r--TAO/tao/PortableServer/POA_Cached_Policies.inl3
-rw-r--r--TAO/tao/PortableServer/POA_Current_Impl.inl3
-rw-r--r--TAO/tao/PortableServer/POA_Policy_Set.inl3
-rw-r--r--TAO/tao/PortableServer/PS_ForwardA.cpp3
-rw-r--r--TAO/tao/PortableServer/PS_ForwardA.h3
-rw-r--r--TAO/tao/PortableServer/PS_ForwardC.cpp3
-rw-r--r--TAO/tao/PortableServer/PS_ForwardC.h3
-rw-r--r--TAO/tao/PortableServer/PS_ForwardS.h3
-rw-r--r--TAO/tao/PortableServer/Regular_POA.inl3
-rw-r--r--TAO/tao/PortableServer/Root_POA.inl3
-rw-r--r--TAO/tao/PortableServer/Servant_Base.inl3
-rw-r--r--TAO/tao/PortableServer/Servant_Upcall.inl3
-rw-r--r--TAO/tao/PortableServer/Servant_var.inl3
-rw-r--r--TAO/tao/PortableServer/Special_Basic_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/UB_String_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Var_Array_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Var_Size_SArgument_T.inl3
-rw-r--r--TAO/tao/PortableServer/Vector_SArgument_T.inl3
-rw-r--r--TAO/tao/Principal.inl3
-rw-r--r--TAO/tao/Profile.inl3
-rw-r--r--TAO/tao/Profile_Transport_Resolver.inl3
-rw-r--r--TAO/tao/Pseudo_VarOut_T.inl3
-rw-r--r--TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl3
-rw-r--r--TAO/tao/RTCORBA/Priority_Mapping_Manager.inl3
-rw-r--r--TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp3
-rw-r--r--TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h3
-rw-r--r--TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp3
-rw-r--r--TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h3
-rw-r--r--TAO/tao/RTCORBA/RT_ProtocolPropertiesS.h3
-rw-r--r--TAO/tao/RTCORBA/RT_Transport_Descriptor.inl3
-rw-r--r--TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl3
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.inl3
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.inl3
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_Manager.inl3
-rw-r--r--TAO/tao/Remote_Invocation.inl3
-rw-r--r--TAO/tao/Reply_Dispatcher.inl3
-rw-r--r--TAO/tao/Seq_Var_T.inl3
-rw-r--r--TAO/tao/Service_Context.inl3
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.inl3
-rw-r--r--TAO/tao/Special_Basic_Argument_T.inl3
-rw-r--r--TAO/tao/Strategies/COIOP_Endpoint.inl3
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.inl3
-rw-r--r--TAO/tao/Strategies/DIOP_Endpoint.inl3
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.inl3
-rw-r--r--TAO/tao/Strategies/SHMIOP_Endpoint.inl3
-rw-r--r--TAO/tao/Strategies/UIOP_Endpoint.inl3
-rw-r--r--TAO/tao/Stub.inl3
-rw-r--r--TAO/tao/Synch_Invocation.inl3
-rw-r--r--TAO/tao/SystemException.inl3
-rw-r--r--TAO/tao/TAO_Server_Request.inl3
-rw-r--r--TAO/tao/TAO_Singleton.cpp3
-rw-r--r--TAO/tao/TAO_Singleton.inl3
-rw-r--r--TAO/tao/TAO_Singleton_Manager.inl3
-rw-r--r--TAO/tao/Tagged_Components.inl3
-rw-r--r--TAO/tao/Tagged_Profile.inl3
-rw-r--r--TAO/tao/Transport.inl3
-rw-r--r--TAO/tao/Transport_Acceptor.inl3
-rw-r--r--TAO/tao/Transport_Connector.inl3
-rw-r--r--TAO/tao/Typecode_typesC.cpp3
-rw-r--r--TAO/tao/Typecode_typesC.h3
-rw-r--r--TAO/tao/Typecode_typesS.h3
-rw-r--r--TAO/tao/UB_String_Argument_T.inl3
-rw-r--r--TAO/tao/UserException.inl3
-rw-r--r--TAO/tao/Utils/PolicyList_Destroyer.inl3
-rw-r--r--TAO/tao/Valuetype/AbstractBase.inl3
-rw-r--r--TAO/tao/Valuetype/ValueBase.inl3
-rw-r--r--TAO/tao/VarOut_T.inl3
-rw-r--r--TAO/tao/Var_Array_Argument_T.inl3
-rw-r--r--TAO/tao/Var_Size_Argument_T.inl3
-rw-r--r--TAO/tao/Vector_Argument_T.inl3
-rw-r--r--TAO/tao/WrongTransactionC.cpp3
-rw-r--r--TAO/tao/WrongTransactionC.h3
-rw-r--r--TAO/tao/WrongTransactionS.h3
-rw-r--r--TAO/tao/params.inl3
-rw-r--r--TAO/tests/Any/Indirected/IndirectedTest.mpc3
-rw-r--r--TAO/tests/Any/Recursive/RecursiveHello.mpc3
-rw-r--r--TAO/tests/Big_Oneways/Session.h3
-rw-r--r--TAO/tests/Big_Twoways/Session.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.cpp3
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_2188_Regression/broken_i.cpp3
-rw-r--r--TAO/tests/Bug_2188_Regression/broken_i.h3
-rw-r--r--TAO/tests/Bug_2241_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc3
-rw-r--r--TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc3
-rw-r--r--TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc3
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp3
-rw-r--r--TAO/tests/Bug_3766_Regression/TestI.cpp3
-rw-r--r--TAO/tests/Bug_3766_Regression/TestI.h3
-rw-r--r--TAO/tests/Bug_3853_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc3
-rw-r--r--TAO/tests/COIOP/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_NoColl/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Tests/Server_Task.h3
-rw-r--r--TAO/tests/DII_AMI_Forward/server_interceptor.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h3
-rw-r--r--TAO/tests/DynAny_Test/da_tests.idl3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp3
-rw-r--r--TAO/tests/MT_BiDir/Sender_i.h3
-rw-r--r--TAO/tests/MT_BiDir/Server_Task.h3
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Server_Task.h3
-rw-r--r--TAO/tests/ORB_init/Portspan/simpleI.cpp3
-rw-r--r--TAO/tests/ORB_init/Portspan/simpleI.h3
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h3
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h3
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/interceptors.h3
-rw-r--r--TAO/tests/Two_Objects/First_i.h3
-rw-r--r--TAO/tests/Two_Objects/Object_Factory_i.h3
-rw-r--r--TAO/tests/Two_Objects/Second_i.h3
-rw-r--r--TAO/tests/Two_Objects/worker.h3
-rw-r--r--TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxBindDialog.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxBindNewContext.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingTree.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewer.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxViewIORDialog.cpp3
536 files changed, 0 insertions, 1599 deletions
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
index 30f066e6126..57c1b902c7c 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.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/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
index f093f6731ef..8b6d57bd407 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h
@@ -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/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h
index b003f111cbb..c24a97e8215 100644
--- a/TAO/examples/Simple/time-date/Time_Date.h
+++ b/TAO/examples/Simple/time-date/Time_Date.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Task.h"
#include "ace/svc_export.h"
#include "tao/default_resource.h"
diff --git a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
index dcb7768c7a9..019e4210026 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
index 25510e64609..e7b490fa096 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
index 12d511c2291..2755fd363b3 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index a06c3bbbc93..59a5b5b8ab1 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "interop_wchar_i.h"
// Implementation skeleton constructor
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 6d17b1af221..50890e75163 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -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/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"
diff --git a/TAO/tao/Acceptor_Registry.inl b/TAO/tao/Acceptor_Registry.inl
index b086cbf1c1b..00ea19bb559 100644
--- a/TAO/tao/Acceptor_Registry.inl
+++ b/TAO/tao/Acceptor_Registry.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_AcceptorSetIterator
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
index 7b54311759b..8429d61c120 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename StringType,
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
index 0f077af6689..cf2439dfac2 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl
index a293f5e0036..bdb65512148 100644
--- a/TAO/tao/AnyTypeCode/Any.inl
+++ b/TAO/tao/AnyTypeCode/Any.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO::Any_Impl *
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
index 939a2e9d3e3..b5f4da26bc2 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T_slice, typename T_forany>
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
index e131b9edacb..abc424b8118 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T>
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
index 2196fba3f3e..8ad5decaf38 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl
index afd8d7fac29..38e3b68d643 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// These three are overridden in generated code where appropriate.
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
index c4ca231a618..30ead3b06c9 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T, typename from_T, typename to_T>
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
index 0cf77cec3bc..431973ee2ba 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
index 64c14e65f51..251989dc216 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename StringType,
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
index 8d2f31eba9c..848bda8cf8f 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
index 62f3e63aac5..bde59223bc6 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class RefCountPolicy>
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.inl b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.inl
index 9fedeed2d7a..6c3cd300171 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl
index 861678e262f..496b37bfb9e 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
index de813439b87..ec8d9e873cb 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename StringType, class RefCountPolicy>
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
index b9492be9bf2..08329b74645 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
index fa836bb9319..b8bf46cc7fb 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
index d74160ed4ab..519abb929e4 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename TypeCodeType, class RefCountPolicy>
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
index 84361bf52de..2b1f0eaa852 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.inl b/TAO/tao/AnyTypeCode/String_TypeCode.inl
index c83c7be8667..057cec45d36 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class RefCountPolicy>
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
index f9b3517f049..a9ab58a5399 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
index d064338ee22..a26b87b82b4 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename StringType,
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
index 7b2d60faa3f..4dc6a6a3c2a 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
index db9631237de..fa4e65da3cf 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl
index 23d79ffd8b5..a9317676261 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<>
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
index 915e4ed9411..a1267fc00e0 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode_Traits.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
index 4bd6b4f8a79..2e7a5b39657 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/CDR.h"
#include "tao/AnyTypeCode/TypeCode_Traits.h"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.inl
index 532249841b3..fb15db68818 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
index f95b599c795..151bdfdbb4b 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Typecode_typesA.h b/TAO/tao/AnyTypeCode/Typecode_typesA.h
index 940a2127d87..b77b9c59c75 100644
--- a/TAO/tao/AnyTypeCode/Typecode_typesA.h
+++ b/TAO/tao/AnyTypeCode/Typecode_typesA.h
@@ -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/tao/AnyTypeCode/Union_TypeCode.inl b/TAO/tao/AnyTypeCode/Union_TypeCode.inl
index 77c18686b2d..2d7097987a8 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename StringType,
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
index 39b9465a2da..f940678f00e 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.inl b/TAO/tao/AnyTypeCode/Value_TypeCode.inl
index 6a16871f136..ad7cf46f4f0 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename StringType,
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
index c35fbce0b42..f433daaeda0 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
index 8e8b1bba3b3..bd3a7c61878 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.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/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h
index 6dda3ef4bac..1f836aecd80 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.h
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h
@@ -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/tao/Asynch_Reply_Dispatcher_Base.inl b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
index 6ce1e3f556f..ec6c1639ce3 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
index 23c9d525798..be53dfee5bf 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_var,
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index f339326f161..38f00954a01 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// ===================================================================
/**
* @file Base_Transport_Property.h
diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl
index b205072f564..a99880c12f8 100644
--- a/TAO/tao/Base_Transport_Property.inl
+++ b/TAO/tao/Base_Transport_Property.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
index 8d1629d7e57..7cf80980fa3 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl
index e7e069797e4..3068dfd7608 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.inl
+++ b/TAO/tao/Bind_Dispatcher_Guard.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// ===========================================================================
//
// = LIBRARY
diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl
index a1597337ee9..be6a75d6075 100644
--- a/TAO/tao/CDR.inl
+++ b/TAO/tao/CDR.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/SystemException.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBALOC_Parser.inl b/TAO/tao/CORBALOC_Parser.inl
index 5515a3c28be..a81ae2f6ac1 100644
--- a/TAO/tao/CORBALOC_Parser.inl
+++ b/TAO/tao/CORBALOC_Parser.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if (TAO_HAS_CORBALOC_PARSER == 1)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl
index daeecf0628c..c1e125fc657 100644
--- a/TAO/tao/CORBA_String.inl
+++ b/TAO/tao/CORBA_String.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
index 24498085725..9015c828530 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/SystemException.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl
index 6f9ad7e08f2..bfc547f58cd 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.inl
+++ b/TAO/tao/CSD_Framework/CSD_POA.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
index 3171057f28d..2849a1bb0f8 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/debug.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
index 60389dc82a6..ed79b01f348 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
index 57854bd9aa8..13c63022c9f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl
index d44f0bc56dd..9454f4d393d 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
index f946b8fd9c6..0dc311aa3c6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/Auto_Ptr.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
index 0a28b4cba66..51599163276 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
index 586f76af3bb..b6ed1be9bcd 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl
index 4242ce41e5d..e395346c9e5 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl
index c63696ab628..0f10b55aca8 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
index 7c266f21c6b..385ea47cd30 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl
index cec37afcdac..f58488d101c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl
index c2c16d34e26..1760cc78377 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl
index 9e26d265f10..de9e490a47a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl
index 36bd9fc5608..ea6e1c7f3bd 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl
index 14a37aa44a9..dc05bd58fd6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
index 2661a54453c..f0e81b2d87a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl
index 5ef996bcb6e..fc4df7e6fd1 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
index ed238fdc25f..32f48ebd249 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl
index 312484f5c8c..429308b3aec 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl
index 21dc662b5d7..d85400274be 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl
index ee32589c8db..1b4121eef81 100644
--- a/TAO/tao/Cache_Entries_T.inl
+++ b/TAO/tao/Cache_Entries_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
index 2216dce7c34..d8b868cd666 100644
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ b/TAO/tao/Cleanup_Func_Registry.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Connection_Purging_Strategy.inl b/TAO/tao/Connection_Purging_Strategy.inl
index a361f536198..52ff23827d2 100644
--- a/TAO/tao/Connection_Purging_Strategy.inl
+++ b/TAO/tao/Connection_Purging_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Connector_Registry.inl b/TAO/tao/Connector_Registry.inl
index 9ecc29436b5..c9c50934295 100644
--- a/TAO/tao/Connector_Registry.inl
+++ b/TAO/tao/Connector_Registry.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_ConnectorSetIterator
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index b3352768202..40ae7e16750 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynAnyFactory.h
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index d5a422d2339..1287c2705ee 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynAny_i.h
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index c914c8618e7..bf7d4e46248 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynSequence_i.h
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 19b98abc906..e081a70f3ca 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynStruct_i.h
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index ec4ae72c54f..efe8e7dc719 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynUnion_i.h
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h
index 5c663c78850..cb427b8da5c 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.h
+++ b/TAO/tao/DynamicAny/DynValueBox_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynValueBox_i.h
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h
index 0236c6b110a..013ad1e6c1f 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.h
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynValueCommon_i.h
diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h
index e54f2d076fb..e186672cf47 100644
--- a/TAO/tao/DynamicAny/DynValue_i.h
+++ b/TAO/tao/DynamicAny/DynValue_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
//=============================================================================
/**
* @file DynValue_i.h
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index 459cc2bca87..d7e2b0a99a3 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl
index c8a05b4183a..201f07d2c6f 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ b/TAO/tao/DynamicInterface/DII_Arguments.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
index 3cc1340b963..21c37cc3898 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ b/TAO/tao/DynamicInterface/ExceptionList.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 84e7880b7c0..69bf66a866d 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Request_ptr
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
index cb06973c11d..460d34c9af0 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ServerRequest_ptr
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl
index 3ce52bb554b..777da1499bf 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.inl b/TAO/tao/Dynamic_TP/DTP_Task.inl
index 5b9eaafbd7d..a773cecc719 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.inl
+++ b/TAO/tao/Dynamic_TP/DTP_Task.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl
index 9c28cc41e0e..dc69f734e13 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Endpoint.inl b/TAO/tao/Endpoint.inl
index ab570490899..ae8df119331 100644
--- a/TAO/tao/Endpoint.inl
+++ b/TAO/tao/Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Environment.inl b/TAO/tao/Environment.inl
index 8227415e62c..26ef68d5aa7 100644
--- a/TAO/tao/Environment.inl
+++ b/TAO/tao/Environment.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_Memory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception.inl b/TAO/tao/Exception.inl
index 2a77bfab959..91778412046 100644
--- a/TAO/tao/Exception.inl
+++ b/TAO/tao/Exception.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Exception *
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index 8ff682fe174..92bf9518788 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_forany,
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
index d83d05f5c69..1b361835386 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl
index 949d67653be..c0912da1c6c 100644
--- a/TAO/tao/IIOP_Acceptor.inl
+++ b/TAO/tao/IIOP_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Endpoint.inl b/TAO/tao/IIOP_Endpoint.inl
index c98e79c652c..d00dc77ff6a 100644
--- a/TAO/tao/IIOP_Endpoint.inl
+++ b/TAO/tao/IIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
index dfb66194baf..645750acf18 100644
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ b/TAO/tao/IORInterceptor/IORInfo.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl
index 26e5026c413..158af586e62 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename T>
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
index 4286a4b5e26..c06193db780 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename T>
diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.inl b/TAO/tao/Intrusive_Ref_Count_Object_T.inl
index 64c04a5772a..818e51e2faa 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.inl
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename OBJ, typename ACE_LOCK>
diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl
index d38a40130d0..5bc144198f9 100644
--- a/TAO/tao/Invocation_Adapter.inl
+++ b/TAO/tao/Invocation_Adapter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
index 6a7e65ae3f7..955310daf83 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/Invocation_Retry_Params.cpp b/TAO/tao/Invocation_Retry_Params.cpp
index 4d966613d36..382c03cef33 100644
--- a/TAO/tao/Invocation_Retry_Params.cpp
+++ b/TAO/tao/Invocation_Retry_Params.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/Invocation_Retry_Params.h"
#include "tao/Invocation_Utils.h"
diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp
index 179572943f4..9ca1994e8b7 100644
--- a/TAO/tao/Invocation_Retry_State.cpp
+++ b/TAO/tao/Invocation_Retry_State.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/Invocation_Retry_State.h"
#include "tao/ORB_Core.h"
#include "tao/Client_Strategy_Factory.h"
diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl
index 2b1345b8efd..66ca21934f6 100644
--- a/TAO/tao/LF_Event.inl
+++ b/TAO/tao/LF_Event.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/tao/LF_Event_Binder.inl b/TAO/tao/LF_Event_Binder.inl
index 6a69f079368..f9c5ddb5efb 100644
--- a/TAO/tao/LF_Event_Binder.inl
+++ b/TAO/tao/LF_Event_Binder.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
index a5c368dea38..de0689bed3d 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl
index 8e88e259759..907a90ebea0 100644
--- a/TAO/tao/LF_Follower.inl
+++ b/TAO/tao/LF_Follower.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Leader_Follower &
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl
index 8d933799401..06586ae2fa0 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.inl
+++ b/TAO/tao/LF_Follower_Auto_Ptr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl
index fce063c5f01..5c9c7d546ea 100644
--- a/TAO/tao/Leader_Follower.inl
+++ b/TAO/tao/Leader_Follower.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// ****************************************************************
#include "tao/ORB_Core_TSS_Resources.h"
diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl
index 81bf2f62c73..37bfee340de 100644
--- a/TAO/tao/LocalObject.inl
+++ b/TAO/tao/LocalObject.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/MCAST_Parser.inl b/TAO/tao/MCAST_Parser.inl
index 297e8756400..db49f4704a8 100644
--- a/TAO/tao/MCAST_Parser.inl
+++ b/TAO/tao/MCAST_Parser.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if (TAO_HAS_MCAST_PARSER == 1)
#include "tao/default_ports.h"
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.inl b/TAO/tao/Messaging/Buffering_Constraint_Policy.inl
index 2176d0efc36..e61bc963895 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.inl
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.inl b/TAO/tao/Messaging/Messaging_Policy_i.inl
index f33ea289267..9c2cb3ef7b5 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.inl
+++ b/TAO/tao/Messaging/Messaging_Policy_i.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl
index 371e894f050..9772329fbec 100644
--- a/TAO/tao/ORB.inl
+++ b/TAO/tao/ORB.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// ---------------------------------------------------------------------------
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index d6c93a6be96..be5af02ee10 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/ORB_Core_TSS_Resources.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl
index d9bd041e77c..85d46f6c3c9 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.inl
+++ b/TAO/tao/ORB_Core_Auto_Ptr.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index b047b8f0493..8994755cbb4 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/ORB_Core.h"
#include <algorithm>
diff --git a/TAO/tao/ORB_Time_Policy.inl b/TAO/tao/ORB_Time_Policy.inl
index 38748f013c3..7094f89aee6 100644
--- a/TAO/tao/ORB_Time_Policy.inl
+++ b/TAO/tao/ORB_Time_Policy.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl
index b78e3244084..d6560cab557 100644
--- a/TAO/tao/Object.inl
+++ b/TAO/tao/Object.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// ****************************************************************
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
index 2f4f3c50475..7a46a14512f 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_ptr,
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index cf9f21c6d50..5a1e8acf35d 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.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/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 90c3930b41d..a9ad2810d07 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -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/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl
index bb61e544556..e6f00479b3c 100644
--- a/TAO/tao/Object_Ref_Table.inl
+++ b/TAO/tao/Object_Ref_Table.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl
index 4e1fccd76dd..8f56018c5f6 100644
--- a/TAO/tao/Objref_VarOut_T.inl
+++ b/TAO/tao/Objref_VarOut_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <typename T>
diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl
index f568bb9fafb..04a89167a0d 100644
--- a/TAO/tao/PI/ClientRequestDetails.inl
+++ b/TAO/tao/PI/ClientRequestDetails.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
index c1c7835148d..c8e3770dccd 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl
index f151fd2711d..470ae448192 100644
--- a/TAO/tao/PI/ORBInitInfo.inl
+++ b/TAO/tao/PI/ORBInitInfo.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index aca42f2786c..f4feb5dff02 100644
--- a/TAO/tao/PI/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE PortableInterceptor::SlotId
diff --git a/TAO/tao/PI/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl
index d35163df7e7..3a5e53d5d2e 100644
--- a/TAO/tao/PI/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp
index 154d3e1c49c..aef337adbfb 100644
--- a/TAO/tao/PI/PolicyFactoryA.cpp
+++ b/TAO/tao/PI/PolicyFactoryA.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/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h
index 97ce1a9d638..861f812f98d 100644
--- a/TAO/tao/PI/PolicyFactoryA.h
+++ b/TAO/tao/PI/PolicyFactoryA.h
@@ -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/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index b35ddae7728..cf36dafbbb1 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.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/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index b184b48496f..cb4be9c2a40 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -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/tao/PI/PolicyFactoryS.h b/TAO/tao/PI/PolicyFactoryS.h
index 63c3eb38f0f..bd563d3fe7c 100644
--- a/TAO/tao/PI/PolicyFactoryS.h
+++ b/TAO/tao/PI/PolicyFactoryS.h
@@ -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/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl
index f653264bdac..741f4e88481 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.inl
+++ b/TAO/tao/PI_Server/ServerRequestDetails.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index dff439df6ca..190306e3b6c 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/PortableServer/Servant_Upcall.h"
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index c6d177b5fc4..69b58662847 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.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/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
index b2f5037350a..c9e7ad47ee1 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
@@ -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/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 4613d34da4a..30d7fe51d1a 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.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/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 86186aac9e5..a766b8b52a1 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -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/tao/PI_Server/ServerRequestInterceptorS.h b/TAO/tao/PI_Server/ServerRequestInterceptorS.h
index 63c3eb38f0f..bd563d3fe7c 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorS.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorS.h
@@ -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/tao/Parser_Registry.inl b/TAO/tao/Parser_Registry.inl
index 5545cece0df..2ebe7c17722 100644
--- a/TAO/tao/Parser_Registry.inl
+++ b/TAO/tao/Parser_Registry.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Parser_Registry::Parser_Iterator
diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl
index 3605ebd5b7e..7342464a589 100644
--- a/TAO/tao/Policy_Current.inl
+++ b/TAO/tao/Policy_Current.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index 753f38fb1e5..b946ea2f974 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl
index a1e1a94d96d..5d1a7f602fa 100644
--- a/TAO/tao/Policy_Manager.inl
+++ b/TAO/tao/Policy_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Policy_Set.inl b/TAO/tao/Policy_Set.inl
index 2263ccd4fad..bd1fd8f2b05 100644
--- a/TAO/tao/Policy_Set.inl
+++ b/TAO/tao/Policy_Set.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl
index 74c638753dc..fad3a561bd3 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.inl
+++ b/TAO/tao/PortableServer/Active_Object_Map.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/PortableServer/Active_Object_Map_Entry.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index 5050cfe8cbe..4258e4a19d6 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
index cadae1c80e8..fd3b9a1c555 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C+ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_var,
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
index 14fe54a4e6b..ad55e7d9bc8 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl
index f629b10e91b..10b275e2435 100644
--- a/TAO/tao/PortableServer/Creation_Time.inl
+++ b/TAO/tao/PortableServer/Creation_Time.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/orbconf.h" /* For POA_NO_TIMESTAMP definition. */
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 837709dd619..9843888e5bb 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_forany,
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
index 4c6288a4954..69029fde51c 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
index 0a9b6f2e8de..eb9d69ca13c 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl
index ed4707efc3c..41fa5df4626 100644
--- a/TAO/tao/PortableServer/Object_Adapter.inl
+++ b/TAO/tao/PortableServer/Object_Adapter.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/SystemException.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
index 9ab6d5308ca..fdda464dbdf 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index 3cfb6cb8936..3dd8e658506 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/SystemException.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl
index 3bf565f61f6..4c42ccef173 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.inl
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl
index cc0ca1c6a7b..0af8dc775eb 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.inl
+++ b/TAO/tao/PortableServer/POA_Current_Impl.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/SystemException.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl
index ced101d0a5d..6b8620f566f 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.inl
+++ b/TAO/tao/PortableServer/POA_Policy_Set.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 548de799c0a..19ee542a23a 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.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/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h
index c3924d03eac..6da547b0892 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.h
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -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/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index 64fa5812533..e261400475a 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.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/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 6f8d825dfd0..aa616834dff 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -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/tao/PortableServer/PS_ForwardS.h b/TAO/tao/PortableServer/PS_ForwardS.h
index f8349fe1207..4e0b85c0a17 100644
--- a/TAO/tao/PortableServer/PS_ForwardS.h
+++ b/TAO/tao/PortableServer/PS_ForwardS.h
@@ -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/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index d585b15ff62..7be5db2b0a2 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#if !defined (CORBA_E_MICRO)
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index 8a7338e4908..f83dc99c883 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/tao/PortableServer/Servant_Base.inl b/TAO/tao/PortableServer/Servant_Base.inl
index afa16b3fb71..d5620d7c42a 100644
--- a/TAO/tao/PortableServer/Servant_Base.inl
+++ b/TAO/tao/PortableServer/Servant_Base.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE u_long
diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl
index 5f016db3fe6..55a62063a64 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Servant_Upcall.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl
index 397c35c8f8b..d3b4b51c590 100644
--- a/TAO/tao/PortableServer/Servant_var.inl
+++ b/TAO/tao/PortableServer/Servant_var.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include <algorithm>
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
index 90b5f23677e..734692c5848 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
index b60809e056d..2476cbcfd75 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S, typename S_var>
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
index c67376fc892..cfbc2319434 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_forany,
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
index 29cc6f4a943..6e7b63d6253 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl
index 5e1bd9fcb84..32db5ff5f3e 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/Principal.inl b/TAO/tao/Principal.inl
index e2bc626f708..99769b607e9 100644
--- a/TAO/tao/Principal.inl
+++ b/TAO/tao/Principal.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl
index 00f4089d984..3076b19cce4 100644
--- a/TAO/tao/Profile.inl
+++ b/TAO/tao/Profile.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 07e89301fa5..e1a8e716b6a 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
index 92e617d88dd..92e327d3f18 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/CORBA_methods.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
index f50348fbe8d..9b2e45ec772 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// *************************************************************
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
index fc6957e33b8..c6eef8a2abd 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// *************************************************************
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
index 336e25a6e87..0316299507a 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.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/tao/RTCORBA/RT_ProtocolPropertiesA.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
index d54639688a1..b96446ca92a 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
@@ -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/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
index 63cba9d193d..c2d3aa2ba91 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.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/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
index 465f05175d7..a74e6f4c1ef 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
@@ -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/tao/RTCORBA/RT_ProtocolPropertiesS.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesS.h
index 63c3eb38f0f..bd563d3fe7c 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesS.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesS.h
@@ -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/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
index 3afd7b186e8..08870128ddc 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
index 89c98fe4485..e2bc9763f4e 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl
index eadf4ae0ebe..f28ea573729 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.inl
+++ b/TAO/tao/RTCORBA/Thread_Pool.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl
index 990d71a4277..ef48b7390bc 100644
--- a/TAO/tao/RTPortableServer/RT_POA.inl
+++ b/TAO/tao/RTPortableServer/RT_POA.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Exception macros
#include "tao/PortableServer/poa_macros.h"
#include "tao/PortableServer/POA_Guard.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index 81ea16eac0b..06c377c6a36 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
diff --git a/TAO/tao/Remote_Invocation.inl b/TAO/tao/Remote_Invocation.inl
index 81249f4f333..8f03fddb649 100644
--- a/TAO/tao/Remote_Invocation.inl
+++ b/TAO/tao/Remote_Invocation.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/Reply_Dispatcher.inl b/TAO/tao/Reply_Dispatcher.inl
index fdbe87db09d..14e89c247a8 100644
--- a/TAO/tao/Reply_Dispatcher.inl
+++ b/TAO/tao/Reply_Dispatcher.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl
index 3b862cdaecf..bee41dfe39c 100644
--- a/TAO/tao/Seq_Var_T.inl
+++ b/TAO/tao/Seq_Var_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_Memory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index 84d7ddda4ba..60bb3b0cc7f 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
index 79966fdc732..3b181689cb5 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 251f23ad1ba..d36f60b04bd 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.inl b/TAO/tao/Strategies/COIOP_Endpoint.inl
index fc263f51058..4cf5ccc3437 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.inl
+++ b/TAO/tao/Strategies/COIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_Utils::UUID&
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl
index 8aa46f549c1..13df2475e50 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.inl
+++ b/TAO/tao/Strategies/DIOP_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_INET_Addr&
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.inl b/TAO/tao/Strategies/DIOP_Endpoint.inl
index 03c7835ffbe..424df7563f4 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.inl
+++ b/TAO/tao/Strategies/DIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const char *
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl
index a5f51de6042..51acffee405 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.inl
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_INET_Addr&
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.inl b/TAO/tao/Strategies/SHMIOP_Endpoint.inl
index e507b39c440..1b0af76c7d5 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.inl
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const char *
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.inl b/TAO/tao/Strategies/UIOP_Endpoint.inl
index a7a01b59c3d..e8c5f07516e 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.inl
+++ b/TAO/tao/Strategies/UIOP_Endpoint.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
# if TAO_HAS_UIOP == 1
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index f217ce10e9a..37913698761 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/ORB_Core.h"
#include "ace/Reverse_Lock_T.h"
diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl
index 3b819af8672..607b714ce43 100644
--- a/TAO/tao/Synch_Invocation.inl
+++ b/TAO/tao/Synch_Invocation.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl
index 25409d98218..979f5d18373 100644
--- a/TAO/tao/SystemException.inl
+++ b/TAO/tao/SystemException.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl
index 92e33e8ccb1..0cdd02c7dde 100644
--- a/TAO/tao/TAO_Server_Request.inl
+++ b/TAO/tao/TAO_Server_Request.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "tao/GIOP_Utils.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index 3698696ddab..a183ce96ac1 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SINGLETON_CPP
#define TAO_SINGLETON_CPP
diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl
index bacacea205e..530fc7ce38c 100644
--- a/TAO/tao/TAO_Singleton.inl
+++ b/TAO/tao/TAO_Singleton.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl
index ae7c71283bc..532e1844faf 100644
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ b/TAO/tao/TAO_Singleton_Manager.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Tagged_Components.inl b/TAO/tao/Tagged_Components.inl
index e19251e5acd..00332ee2d49 100644
--- a/TAO/tao/Tagged_Components.inl
+++ b/TAO/tao/Tagged_Components.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl
index 1591c8c4633..15abf95aff9 100644
--- a/TAO/tao/Tagged_Profile.inl
+++ b/TAO/tao/Tagged_Profile.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index e5706c01737..59f0589dc8e 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl
index b4c15ab6a6d..700216cd082 100644
--- a/TAO/tao/Transport_Acceptor.inl
+++ b/TAO/tao/Transport_Acceptor.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
index 64683bc6a14..30c7d450024 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_ORB_Core *
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
index d891d244be4..39f25937718 100644
--- a/TAO/tao/Typecode_typesC.cpp
+++ b/TAO/tao/Typecode_typesC.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/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
index 95b7fe2dfb4..af99448ee35 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -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/tao/Typecode_typesS.h b/TAO/tao/Typecode_typesS.h
index 63c3eb38f0f..bd563d3fe7c 100644
--- a/TAO/tao/Typecode_typesS.h
+++ b/TAO/tao/Typecode_typesS.h
@@ -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/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index 6c549aaca4a..dbdc0e033ab 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_var,
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index 0e1d3295264..3bba257dd04 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.inl b/TAO/tao/Utils/PolicyList_Destroyer.inl
index a93e6334c87..3bb43d410ac 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.inl
+++ b/TAO/tao/Utils/PolicyList_Destroyer.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index 32164d5b662..e078a365a89 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ace/OS_NS_string.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index adf3a18ebcc..3015b22d45c 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// Detection of flags in the CDR Stream
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl
index 7735ef6cefb..fb4519660af 100644
--- a/TAO/tao/VarOut_T.inl
+++ b/TAO/tao/VarOut_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T>
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index 67be4cb6650..10da0ada3a3 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S_forany,
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index e87929d6c42..eba3d623bea 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/Vector_Argument_T.inl b/TAO/tao/Vector_Argument_T.inl
index 127306c318f..64cb530b676 100644
--- a/TAO/tao/Vector_Argument_T.inl
+++ b/TAO/tao/Vector_Argument_T.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename S,
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 54089fa85fe..e9055d36cda 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.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/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index bf47041b9b7..56bc946cd89 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -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/tao/WrongTransactionS.h b/TAO/tao/WrongTransactionS.h
index 63c3eb38f0f..bd563d3fe7c 100644
--- a/TAO/tao/WrongTransactionS.h
+++ b/TAO/tao/WrongTransactionS.h
@@ -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/tao/params.inl b/TAO/tao/params.inl
index e607d6f7588..b6093aed662 100644
--- a/TAO/tao/params.inl
+++ b/TAO/tao/params.inl
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE int
diff --git a/TAO/tests/Any/Indirected/IndirectedTest.mpc b/TAO/tests/Any/Indirected/IndirectedTest.mpc
index 483f231c9d4..aa9ed68b228 100644
--- a/TAO/tests/Any/Indirected/IndirectedTest.mpc
+++ b/TAO/tests/Any/Indirected/IndirectedTest.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 1a24787bc1e..974f137cc48 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
NonRecursive.idl
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index d7ead0a9a8c..e085eaf5c3c 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BIG_ONEWAYS_SESSION_H
#define BIG_ONEWAYS_SESSION_H
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 5c0934db301..1ba68b85b77 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BIG_TWOWAYS_SESSION_H
#define BIG_TWOWAYS_SESSION_H
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 23a798743b6..2c4921837d5 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index bb9804ef668..3073b9069b0 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index 88578e5d335..ad7ed5cb1e1 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* @file test_i.cpp
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index 346ec702c70..ce694224731 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -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/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index 55ed7628215..0045d9c8970 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.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/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index ac3add2cdc8..4df02de9d58 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -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/tests/Bug_2241_Regression/Server_Task.h b/TAO/tests/Bug_2241_Regression/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc b/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
+++ b/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc b/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
+++ b/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc b/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
+++ b/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ClientORBInitializer.h"
void
diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp
index 8a6e189eee3..181c2886086 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.cpp
+++ b/TAO/tests/Bug_3766_Regression/TestI.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h
index b5f77e17d02..b731c02c884 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.h
+++ b/TAO/tests/Bug_3766_Regression/TestI.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h
index 0530de3d658..2042b5f9872 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc b/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
index 25f0f8e8f5f..5d8dc4424b6 100644
--- a/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
+++ b/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
idlflags += -Sp
idlflags -= -ae
diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/COIOP/Server_Task.h
+++ b/TAO/tests/COIOP/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.h b/TAO/tests/Collocated_DerivedIF/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.h b/TAO/tests/Collocated_NoColl/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_NoColl/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.h b/TAO/tests/DII_AMI_Forward/server_interceptor.h
index 8300f690343..a5496d72271 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.h
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
index 866eca8d10d..6e6d7085452 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
index 1b8ff8da26a..690c31bb2a7 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index 233fc00ea76..41f04581386 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -1,7 +1,4 @@
/* -*- C++ -*- */
-//
-// $Id$
-
#include <orb.idl>
module DynAnyTests
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc b/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
index 3d2f45850f7..99fe40c4e1d 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
+++ b/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
@@ -1,8 +1,5 @@
// What I'd really like to have is a separate project
// that is a library for the CORBA Object.
-//
-// $Id$
-
project(list_interfaces) : taoexe {
Source_Files {
list_interfaces.cpp
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index 7bdbfc10987..2b3c830f3ec 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -1,9 +1,6 @@
//
// This initializes an ORB, a POA, an Object within that POA, and
// obtains and prints an IOR for that Object.
-//
-// $Id$
-
#include "tao/corba.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 79032e33f6f..a57494d613d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h
index 42686741b21..3a34b55d44c 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/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/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
index f2e8d54f467..ce6324fb1e6 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.cpp
+++ b/TAO/tests/ORB_init/Portspan/simpleI.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/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
index 82f58709d84..f1585e382e5 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.h
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -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/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index efe8ef39a88..de95918d721 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index b2f106599f9..0f2492ffa39 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index d0ea171f9ce..571addecc3e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 33cd057ed2a..940b75fd189 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ClientORBInitializer.h"
void
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 4816c106c71..33ed2b76898 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index d904a3f507a..40f5e613113 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
index 80338bf5bde..fecb2b05fdd 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Collocated_ORBInitializer.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index 6499213ab03..bfe8918012a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index a22ea274557..23dfac6b088 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 1b271359c52..4fc60a541bc 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_INTERCEPTORS_H
#define TAO_INTERCEPTORS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 3a06286218c..84cdaa3c472 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index f522246aefb..d2c2e6de155 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_SERVER_ORB_INITIALIZER_H
#define TAO_ECHO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 36835290eb9..41f75c15a45 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index 754bea0000f..97ae5106f72 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
index c625755ff58..c41c39e0bca 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*Server): taoserver, iorinterceptor, interceptors {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
index 0eb892fe7f8..a360e498266 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Collocated_ORBInitializer.h"
#include "interceptors.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 67930a90275..9fc120bc16b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index cbc56e7ae60..8306c7f8a9a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index 20fce3fbff1..1c55d41bbfc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_INTERCEPTORS_H
#define TAO_INTERCEPTORS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
index 6aca7e80aac..15e101d9b8f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Client_ORBInitializer.h"
#include "client_interceptor.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index c3527047ad8..51fdd6e6f9f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
index dc9f9092a96..35392d319e8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Server_ORBInitializer.h"
#include "server_interceptor.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index 7fa088d2b74..1918eb4f31f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_SERVER_ORB_INITIALIZER_H
#define TAO_ECHO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
index d8191b98755..cc5cd7a8eb6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TEST_SERVER_TASK_H
#define TEST_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index 6d17ec03c4b..6c0cd3318c6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 44dab0149bb..753c8cef055 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index 25510e64609..e7b490fa096 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 12d511c2291..2755fd363b3 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
index e3f2a2850cc..e3592668b11 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef INTERCEPTORS_H
#define INTERCEPTORS_H
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index e3f2a2850cc..e3592668b11 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef INTERCEPTORS_H
#define INTERCEPTORS_H
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 2c66560aa93..0d15b14b8d1 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_FIRST_I_H
#define TAO_TWO_OBJECTS_FIRST_I_H
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 5735a295a6b..5d7c6f53d26 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef OBJECT_FACTORY_I_H
#define OBJECT_FACTORY_I_H
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 6bc2d4b3179..c4f54572700 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_SECOND_I_H
#define TAO_TWO_OBJECTS_SECOND_I_H
diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h
index 5448f00e253..1df842862e9 100644
--- a/TAO/tests/Two_Objects/worker.h
+++ b/TAO/tests/Two_Objects/worker.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_WORKER_H
#define TAO_TWO_OBJECTS_WORKER_H
diff --git a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp
index c3054807464..6b58dff7520 100644
--- a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp
+++ b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp
@@ -1,9 +1,6 @@
// @file wxAddNameServerDlg.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxAddNameServerDlg.h"
diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
index 008b5267796..303d835bb76 100644
--- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
@@ -1,9 +1,6 @@
// @file wxBindDialog.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxBindDialog.h"
diff --git a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
index 748c51c5ec7..42310af30c4 100644
--- a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp
@@ -1,9 +1,6 @@
// @file wxBindNewContext.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxBindNewContext.h"
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
index c8e617d475e..e900f66dc37 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
@@ -1,9 +1,6 @@
// @file wxNamingTree.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxNamingTree.h"
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
index a2a61b35140..c8f8ab64bb7 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
@@ -3,9 +3,6 @@
// Based on NamingViewer Version 1.0 by Chris Hafey (chris@stentorsoft.com)
//
// @author: Charlie Frasch (cfrasch@atdesk.com)
-//
-// $Id$
-
#include "ace/Init_ACE.h"
#include "pch.h"
#include "wx/resource.h"
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index 0d88b76a8e9..abd14d11e1f 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -1,9 +1,6 @@
// @file wxNamingViewerFrame.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxNamingViewerFrame.h"
diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
index 8657771243d..5b0a8386324 100644
--- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
@@ -1,9 +1,6 @@
// @file wxSelectNSDialog.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxSelectNSDialog.h"
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index 6c87e29d5cf..6b773657f58 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -1,9 +1,6 @@
// @file wxViewIORDialog.cpp
//
// @author Charlie Frasch <cfrasch@atdesk.com>
-//
-// $Id$
-
#include "pch.h"
#include "wxViewIORDialog.h"