Tue Sep 7 10:52:59 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * PROBLEM-REPORT-FORM:
        * VERSION:
          Updated support email addresses

        * examples/CSD_Strategy/ThreadPool2/FooServantList.h:
        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
          Use ACE_Atomic_Op instead of a mutex with a guard

        * examples/CSD_Strategy/ThreadPool5/FooServantList.h:
        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
          Use ACE_GUARD

        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
          Use ACE_GUARD

        * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
          Removed not used members

        * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
          Unicode fixes

        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
          Use ACE_GUARD, removed commented out code

        * orbsvcs/examples/PSS/Server.idl:
        * orbsvcs/examples/PSS/Server_i.h:
        * orbsvcs/examples/PSS/Server_i.cpp:
        * orbsvcs/examples/PSS/Simple_Naming.idl:
        * orbsvcs/examples/PSS/Simple_Naming.cpp:
        * orbsvcs/examples/PSS/Simple_Naming_i.h:
        * orbsvcs/examples/PSS/client.cpp:
          Removed ACE_RCSID

        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp:
          Removed ACE_RCSID, use ACE_GUARD macros

        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
        * orbsvcs/orbsvcs/Notify/Consumer.h:
        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h:
        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp:
          Use ACE_GUARD

        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
          Disable ACE_Guard fuzz check for some parts of this file

        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
          Removed not used members

        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
          Layout and unicode changes

        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
          Initialize pointer with 0

        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
          Use ACE_GUARD

        * tao/Abstract_Servant_Base.cpp:
        * tao/Acceptor_Filter.cpp:
        * tao/Acceptor_Registry.cpp:
        * tao/Adapter.cpp:
        * tao/Adapter_Registry.cpp:
          Removed ACE_RCSID

        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
        * tao/AnyTypeCode/Any.cpp:
        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
        * tao/AnyTypeCode/Any_Impl.cpp:
        * tao/AnyTypeCode/Any_SystemException.cpp:
        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp:
        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
        * tao/AnyTypeCode/ExceptionA.cpp:
        * tao/AnyTypeCode/Marshal.cpp:
        * tao/AnyTypeCode/NVList_Adapter_Impl.cpp:
        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
        * tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
        * tao/AnyTypeCode/String_TypeCode_Static.cpp:
        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
        * tao/AnyTypeCode/SystemExceptionA.cpp:
        * tao/AnyTypeCode/True_RefCount_Policy.cpp:
        * tao/AnyTypeCode/TypeCodeA.cpp:
        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
        * tao/AnyTypeCode/TypeCode_Constants.cpp:
        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
        * tao/AnyTypeCode/append.cpp:
        * tao/AnyTypeCode/skip.cpp:
          Removed ACE_RCSID

        * tao/AnyTypeCode_Adapter.cpp:
        * tao/Asynch_Queued_Message.cpp:
        * tao/Asynch_Reply_Dispatcher_Base.cpp:
        * tao/Base_Transport_Property.cpp:
        * tao/BiDir_Adapter.cpp:
          Removed ACE_RCSID

        * tao/BiDir_GIOP/BiDirGIOP.cpp:
        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
        * tao/BiDir_GIOP/BiDir_ORBInitializer.cpp:
        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
        * tao/BiDir_GIOP/BiDir_Policy_i.cpp:
        * tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp:
          Removed ACE_RCSID

        * tao/Bind_Dispatcher_Guard.cpp:
        * tao/Block_Flushing_Strategy.cpp:
        * tao/Blocked_Connect_Strategy.cpp:
        * tao/CDR.cpp:
        * tao/CORBALOC_Parser.cpp:
        * tao/CORBA_String.cpp:
          Removed ACE_RCSID

        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
        * tao/CSD_Framework/CSD_POA.cpp:
        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
        * tao/CSD_Framework/CSD_Strategy_Proxy.cpp:
        * tao/CSD_Framework/CSD_Strategy_Repository.cpp:
          Removed ACE_RCSID

        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Queue.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Request.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp:
        * tao/CSD_ThreadPool/CSD_TP_Task.h:
        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
          Removed ACE_RCSID

        * tao/Cleanup_Func_Registry.cpp:
        * tao/ClientRequestInterceptor_Adapter.cpp:
        * tao/ClientRequestInterceptor_Adapter_Factory.cpp:
        * tao/Client_Strategy_Factory.cpp:
        * tao/Codeset_Manager.cpp:
        * tao/Codeset_Manager_Factory_Base.cpp:
        * tao/Codeset_Translator_Base.cpp:
        * tao/Collocated_Invocation.cpp:
        * tao/Collocation_Proxy_Broker.cpp:
        * tao/Collocation_Resolver.cpp:
          Removed ACE_RCSID

        * tao/Compression/Base_Compressor.cpp:
        * tao/Compression/Compression.cpp:
        * tao/Compression/Compression_Manager.cpp:
        * tao/Compression/Compressor_Factory.cpp:
          Removed ACE_RCSID

        * tao/Compression/bzip2/Bzip2Compressor.cpp:
        * tao/Compression/bzip2/Bzip2Compressor_Factory.cpp:
          Removed ACE_RCSID

        * tao/Compression/lzo/LzoCompressor.cpp:
        * tao/Compression/lzo/LzoCompressor_Factory.cpp:
          Removed ACE_RCSID

        * tao/Compression/zlib/ZlibCompressor.cpp:
        * tao/Compression/zlib/ZlibCompressor_Factory.cpp:
          Removed ACE_RCSID

        * tao/Connection_Handler.cpp:
          Fixed bugzilla 3658

        * tao/Configurable_Refcount.cpp:
        * tao/Connection_Purging_Strategy.cpp:
        * tao/Connector_Registry.cpp:
        * tao/DLL_Parser.cpp:
        * tao/Default_Collocation_Resolver.cpp:
        * tao/Default_Endpoint_Selector_Factory.cpp:
        * tao/Default_Thread_Lane_Resources_Manager.cpp:
          Removed ACE_RCSID

        * tao/DiffServPolicy/Client_Network_Priority_Policy.cpp:
        * tao/DiffServPolicy/DiffServPolicy.cpp:
        * tao/DiffServPolicy/DiffServPolicy_Factory.cpp:
        * tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp:
        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp:
        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp:
        * tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp:
        * tao/DiffServPolicy/Server_Network_Priority_Policy.cpp:
          Removed ACE_RCSID

        * tao/DynamicAny/DynAnyFactory.cpp:
        * tao/DynamicAny/DynAny_i.cpp:
        * tao/DynamicAny/DynArray_i.cpp:
        * tao/DynamicAny/DynCommon.cpp:
        * tao/DynamicAny/DynEnum_i.cpp:
        * tao/DynamicAny/DynSequence_i.cpp:
        * tao/DynamicAny/DynStruct_i.cpp:
        * tao/DynamicAny/DynUnion_i.cpp:
        * tao/DynamicAny/DynValueBox_i.cpp:
        * tao/DynamicAny/DynValueCommon_i.cpp:
        * tao/DynamicAny/DynValue_i.cpp:
        * tao/DynamicAny/DynamicAny.cpp:
          Removed ACE_RCSID

        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
        * tao/DynamicInterface/Context.cpp:
        * tao/DynamicInterface/DII_Arguments.cpp:
        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
        * tao/DynamicInterface/DII_Invocation.cpp:
        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
        * tao/DynamicInterface/DII_Reply_Handler.cpp:
        * tao/DynamicInterface/Dynamic_Adapter_Impl.cpp:
        * tao/DynamicInterface/Dynamic_Implementation.cpp:
        * tao/DynamicInterface/ExceptionList.cpp:
        * tao/DynamicInterface/Request.cpp:
        * tao/DynamicInterface/Server_Request.cpp:
        * tao/DynamicInterface/Unknown_User_Exception.cpp:
          Removed ACE_RCSID

        * tao/Dynamic_Adapter.cpp:
        * tao/Endpoint.cpp:
          Removed ACE_RCSID

        * tao/EndpointPolicy/EndpointPolicy.cpp:
        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
        * tao/Endpoint_Selector_Factory.cpp:
        * tao/Exception.cpp:
        * tao/Exclusive_TMS.cpp:
        * tao/FILE_Parser.cpp:
        * tao/Fault_Tolerance_Service.cpp:
        * tao/Flushing_Strategy.cpp:
        * tao/FoxResource/FoxResource_Factory.cpp:
        * tao/FoxResource/FoxResource_Loader.cpp:
        * tao/GIOP_Message_Base.cpp:
        * tao/GIOP_Message_Generator_Parser_11.cpp:
        * tao/GIOP_Message_Generator_Parser_12.cpp:
        * tao/GIOP_Message_Generator_Parser_Impl.cpp:
        * tao/GIOP_Message_Locate_Header.cpp:
        * tao/GIOP_Message_State.cpp:
        * tao/GIOP_Message_Version.cpp:
        * tao/HTTP_Parser.cpp:
        * tao/IFR_Client_Adapter.cpp:
        * tao/IIOP_Acceptor.cpp:
        * tao/IIOP_Connector.cpp:
        * tao/IIOP_Endpoint.cpp:
        * tao/IIOP_Profile.cpp:
        * tao/IIOP_Transport.cpp:
        * tao/IORInterceptor_Adapter.cpp:
        * tao/IORInterceptor_Adapter_Factory.cpp:
        * tao/IORManipulation/IORManip_Filter.cpp:
        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
        * tao/IORManipulation/IORManip_Loader.cpp:
        * tao/IORManipulation/IORManipulation.cpp:
        * tao/IORTable/IORTable.cpp:
        * tao/IORTable/IOR_Table_Impl.cpp:
        * tao/IORTable/Table_Adapter.cpp:
        * tao/IOR_Parser.cpp:
        * tao/ImR_Client/ImR_Client.cpp:
        * tao/Incoming_Message_Queue.cpp:
        * tao/Incoming_Message_Stack.cpp:
        * tao/Invocation_Adapter.cpp:
        * tao/Invocation_Base.cpp:
        * tao/Invocation_Endpoint_Selectors.cpp:
        * tao/LF_CH_Event.cpp:
        * tao/LF_Connect_Strategy.cpp:
        * tao/LF_Event.cpp:
        * tao/LF_Event_Binder.cpp:
        * tao/LF_Follower.cpp:
        * tao/LF_Follower_Auto_Adder.cpp:
        * tao/LF_Invocation_Event.cpp:
        * tao/LF_Multi_Event.cpp:
        * tao/LF_Strategy.cpp:
        * tao/LF_Strategy_Complete.cpp:
        * tao/LRU_Connection_Purging_Strategy.cpp:
        * tao/Leader_Follower.cpp:
        * tao/Leader_Follower_Flushing_Strategy.cpp:
        * tao/LocalObject.cpp:
        * tao/MCAST_Parser.cpp:
        * tao/MProfile.cpp:
        * tao/Messaging/AMI_Arguments_Converter_Impl.cpp:
        * tao/Messaging/Asynch_Invocation.cpp:
        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
        * tao/Messaging/Asynch_Timeout_Handler.cpp:
        * tao/Messaging/Buffering_Constraint_Policy.cpp:
        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
        * tao/Messaging/ExceptionHolder_i.cpp:
        * tao/Messaging/Messaging.cpp:
        * tao/Messaging/Messaging_Loader.cpp:
        * tao/Messaging/Messaging_ORBInitializer.cpp:
        * tao/Messaging/Messaging_PolicyFactory.cpp:
        * tao/Messaging/Messaging_Policy_i.cpp:
        * tao/Messaging/Messaging_Queueing_Strategies.cpp:
        * tao/Monitor/Monitor.cpp:
        * tao/Monitor/Monitor_Impl.cpp:
        * tao/Muxed_TMS.cpp:
        * tao/NVList_Adapter.cpp:
        * tao/Network_Priority_Protocols_Hooks.cpp:
        * tao/ORB.cpp:
        * tao/ORBInitializer_Registry.cpp:
        * tao/ORBInitializer_Registry_Adapter.cpp:
        * tao/ORB_Core.cpp:
        * tao/ORB_Core_Auto_Ptr.cpp:
        * tao/ORB_Table.cpp:
        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
        * tao/ObjectKey_Table.cpp:
        * tao/Object_Loader.cpp:
        * tao/Object_Proxy_Broker.cpp:
        * tao/Object_Ref_Table.cpp:
        * tao/PI/ClientRequestDetails.cpp:
        * tao/PI/ClientRequestInfo.cpp:
        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
        * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp:
        * tao/PI/DLL_Resident_ORB_Initializer.cpp:
        * tao/PI/ORBInitInfo.cpp:
        * tao/PI/ORBInitializer_Registry_Impl.cpp:
        * tao/PI/PI.cpp:
        * tao/PI/PICurrent.cpp:
        * tao/PI/PICurrent_Impl.cpp:
        * tao/PI/PICurrent_Loader.cpp:
        * tao/PI/PI_ORBInitializer.cpp:
        * tao/PI/PI_PolicyFactory.cpp:
        * tao/PI/PolicyFactory_Loader.cpp:
        * tao/PI/PolicyFactory_Registry.cpp:
        * tao/PI/ProcessingModePolicy.cpp:
        * tao/PI/RequestInfo_Util.cpp:
        * tao/PI/RequestInterceptor_Adapter_Impl.cpp:
        * tao/PI_Server/PICurrent_Guard.cpp:
        * tao/PI_Server/PI_Server.cpp:
        * tao/PI_Server/PI_Server_Loader.cpp:
        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
        * tao/PI_Server/ServerInterceptorAdapter.cpp:
        * tao/PI_Server/ServerRequestDetails.cpp:
        * tao/PI_Server/ServerRequestInfo.cpp:
        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp:
        * tao/Pluggable_Messaging_Utils.cpp:
        * tao/PolicyFactory_Registry_Adapter.cpp:
        * tao/PolicyFactory_Registry_Factory.cpp:
        * tao/Policy_Current.cpp:
        * tao/Policy_Manager.cpp:
        * tao/Policy_Set.cpp:
        * tao/Policy_Validator.cpp:
        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
        * tao/PortableServer/Active_Object_Map.cpp:
        * tao/PortableServer/Active_Object_Map_Entry.cpp:
        * tao/PortableServer/Active_Policy_Strategies.cpp:
        * tao/PortableServer/Adapter_Activator.cpp:
        * tao/PortableServer/Collocated_Arguments_Converter.cpp:
        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
        * tao/PortableServer/Creation_Time.cpp:
        * tao/PortableServer/Default_Acceptor_Filter.cpp:
        * tao/PortableServer/Default_Policy_Validator.cpp:
        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
        * tao/PortableServer/IdAssignmentPolicy.cpp:
        * tao/PortableServer/IdAssignmentStrategy.cpp:
        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
        * tao/PortableServer/IdAssignmentStrategyUser.cpp:
        * tao/PortableServer/IdUniquenessPolicy.cpp:
        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
        * tao/PortableServer/ImR_Client_Adapter.cpp:
        * tao/PortableServer/ImplicitActivationPolicy.cpp:
        * tao/PortableServer/ImplicitActivationStrategy.cpp:
        * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp:
        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
        * tao/PortableServer/Key_Adapters.cpp:
        * tao/PortableServer/LifespanPolicy.cpp:
        * tao/PortableServer/LifespanStrategy.cpp:
        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
        * tao/PortableServer/LifespanStrategyPersistent.cpp:
        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
        * tao/PortableServer/LifespanStrategyTransient.cpp:
        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
        * tao/PortableServer/Local_Servant_Base.cpp:
        * tao/PortableServer/Network_Priority_Hook.cpp:
        * tao/PortableServer/Non_Servant_Upcall.cpp:
        * tao/PortableServer/ORT_Adapter_Factory.cpp:
        * tao/PortableServer/Object_Adapter.cpp:
        * tao/PortableServer/Operation_Table.cpp:
        * tao/PortableServer/Operation_Table_Binary_Search.cpp:
        * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp:
        * tao/PortableServer/Operation_Table_Linear_Search.cpp:
        * tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
        * tao/PortableServer/POAManager.cpp:
        * tao/PortableServer/POAManagerFactory.cpp:
        * tao/PortableServer/POA_Cached_Policies.cpp:
        * tao/PortableServer/POA_Current.cpp:
        * tao/PortableServer/POA_Current_Impl.cpp:
        * tao/PortableServer/POA_Guard.h:
        * tao/PortableServer/POA_Guard.cpp:
        * tao/PortableServer/POA_Policy_Set.cpp:
        * tao/PortableServer/PortableServer.cpp:
        * tao/PortableServer/PortableServer_Functions.cpp:
        * tao/PortableServer/PortableServer_WFunctions.cpp:
        * tao/PortableServer/Regular_POA.cpp:
        * tao/PortableServer/RequestProcessingPolicy.cpp:
        * tao/PortableServer/RequestProcessingStrategy.cpp:
        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
        * tao/PortableServer/Root_POA.cpp:
        * tao/PortableServer/ServantRetentionPolicy.cpp:
        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
        * tao/PortableServer/Servant_Base.cpp:
        * tao/PortableServer/Servant_Dispatcher.cpp:
        * tao/PortableServer/Servant_Upcall.cpp:
        * tao/PortableServer/StrategyFactory.cpp:
        * tao/PortableServer/ThreadPolicy.cpp:
        * tao/PortableServer/ThreadStrategy.cpp:
        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
        * tao/PortableServer/ThreadStrategyORBControl.cpp:
        * tao/PortableServer/ThreadStrategySingle.cpp:
        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
        * tao/PortableServer/Upcall_Command.cpp:
        * tao/PortableServer/Upcall_Wrapper.cpp:
        * tao/Profile.cpp:
        * tao/Protocol_Factory.cpp:
        * tao/Protocols_Hooks.cpp:
        * tao/QtResource/QtResource_Factory.cpp:
        * tao/QtResource/QtResource_Loader.cpp:
        * tao/Queued_Data.cpp:
        * tao/Queued_Message.cpp:
        * tao/RTCORBA/Continuous_Priority_Mapping.cpp:
        * tao/RTCORBA/Direct_Priority_Mapping.cpp:
        * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp:
        * tao/RTCORBA/Linear_Priority_Mapping.cpp:
        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
        * tao/RTCORBA/Network_Priority_Mapping.cpp:
        * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp:
        * tao/RTCORBA/Priority_Mapping.cpp:
        * tao/RTCORBA/Priority_Mapping_Manager.cpp:
        * tao/RTCORBA/RTCORBA.cpp:
        * tao/RTCORBA/RT_Current.cpp:
        * tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp:
        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
        * tao/RTCORBA/RT_Mutex.cpp:
        * tao/RTCORBA/RT_ORB.cpp:
        * tao/RTCORBA/RT_ORBInitializer.cpp:
        * tao/RTCORBA/RT_ORB_Loader.cpp:
        * tao/RTCORBA/RT_PolicyFactory.cpp:
        * tao/RTCORBA/RT_Policy_i.cpp:
        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
        * tao/RTCORBA/RT_Stub.cpp:
        * tao/RTCORBA/RT_Stub_Factory.cpp:
        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
        * tao/RTCORBA/RT_Transport_Descriptor_Property.cpp:
        * tao/RTCORBA/Thread_Pool.cpp:
        * tao/RTPortableServer/RTPortableServer.cpp:
        * tao/RTPortableServer/RT_Acceptor_Filters.cpp:
        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
        * tao/RTPortableServer/RT_POA.cpp:
        * tao/RTPortableServer/RT_Policy_Validator.cpp:
        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
        * tao/RTScheduling/Current.cpp:
        * tao/RTScheduling/RTScheduler.cpp:
        * tao/RTScheduling/RTScheduler_Initializer.cpp:
        * tao/RTScheduling/RTScheduler_Loader.cpp:
        * tao/RTScheduling/RTScheduler_Manager.cpp:
        * tao/RTScheduling/Request_Interceptor.cpp:
        * tao/Reactive_Connect_Strategy.cpp:
        * tao/Reactive_Flushing_Strategy.cpp:
        * tao/Refcounted_ObjectKey.cpp:
        * tao/Remote_Invocation.cpp:
        * tao/Remote_Object_Proxy_Broker.cpp:
        * tao/Reply_Dispatcher.cpp:
        * tao/RequestInterceptor_Adapter.cpp:
        * tao/Request_Dispatcher.cpp:
        * tao/Resource_Factory.cpp:
        * tao/Resume_Handle.cpp:
        * tao/ServerRequestInterceptor_Adapter.cpp:
        * tao/ServerRequestInterceptor_Adapter_Factory.cpp:
        * tao/Server_Strategy_Factory.cpp:
        * tao/Service_Callbacks.cpp:
        * tao/Service_Context.cpp:
        * tao/Service_Context_Handler_Registry.cpp:
        * tao/SmartProxies/Smart_Proxies.cpp:
        * tao/Strategies/COIOP_Acceptor.cpp:
        * tao/Strategies/COIOP_Connection_Handler.cpp:
        * tao/Strategies/COIOP_Connector.cpp:
        * tao/Strategies/COIOP_Endpoint.cpp:
        * tao/Strategies/COIOP_Factory.cpp:
        * tao/Strategies/COIOP_Profile.cpp:
        * tao/Strategies/COIOP_Transport.cpp:
        * tao/Strategies/DIOP_Acceptor.cpp:
        * tao/Strategies/DIOP_Connection_Handler.cpp:
        * tao/Strategies/DIOP_Connector.cpp:
        * tao/Strategies/DIOP_Endpoint.cpp:
        * tao/Strategies/DIOP_Factory.cpp:
        * tao/Strategies/DIOP_Profile.cpp:
        * tao/Strategies/DIOP_Transport.cpp:
        * tao/Strategies/FIFO_Connection_Purging_Strategy.cpp:
        * tao/Strategies/LFU_Connection_Purging_Strategy.cpp:
        * tao/Strategies/LF_Strategy_Null.cpp:
        * tao/Strategies/NULL_Connection_Purging_Strategy.cpp:
        * tao/Strategies/OC_Endpoint_Selector_Factory.cpp:
        * tao/Strategies/OC_Endpoint_Selector_Loader.cpp:
        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
        * tao/Strategies/SCIOP_Acceptor.cpp:
        * tao/Strategies/SCIOP_Connection_Handler.cpp:
        * tao/Strategies/SCIOP_Connector.cpp:
        * tao/Strategies/SCIOP_Endpoint.cpp:
        * tao/Strategies/SCIOP_Factory.cpp:
        * tao/Strategies/SCIOP_Profile.cpp:
        * tao/Strategies/SCIOP_Transport.cpp:
        * tao/Strategies/SHMIOP_Acceptor.cpp:
        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
        * tao/Strategies/SHMIOP_Connector.cpp:
        * tao/Strategies/SHMIOP_Endpoint.cpp:
        * tao/Strategies/SHMIOP_Factory.cpp:
        * tao/Strategies/SHMIOP_Profile.cpp:
        * tao/Strategies/SHMIOP_Transport.cpp:
        * tao/Strategies/Strategies_ORBInitializer.cpp:
        * tao/Strategies/UIOP_Acceptor.cpp:
        * tao/Strategies/UIOP_Connection_Handler.cpp:
        * tao/Strategies/UIOP_Connector.cpp:
        * tao/Strategies/UIOP_Endpoint.cpp:
        * tao/Strategies/UIOP_Factory.cpp:
        * tao/Strategies/UIOP_Profile.cpp:
        * tao/Strategies/UIOP_Transport.cpp:
        * tao/Strategies/advanced_resource.cpp:
        * tao/String_Alloc.cpp:
        * tao/Stub.cpp:
        * tao/Synch_Invocation.cpp:
        * tao/Synch_Queued_Message.cpp:
        * tao/Synch_Reply_Dispatcher.cpp:
        * tao/SystemException.cpp:
        * tao/TAO_Internal.cpp:
        * tao/TAO_Singleton_Manager.cpp:
        * tao/TSS_Resources.cpp:
        * tao/Tagged_Components.cpp:
        * tao/Tagged_Profile.cpp:
        * tao/Thread_Lane_Resources.cpp:
        * tao/Thread_Lane_Resources_Manager.cpp:
        * tao/Thread_Per_Connection_Handler.cpp:
        * tao/TkResource/TkResource_Factory.cpp:
        * tao/TkResource/TkResource_Loader.cpp:
        * tao/Transport.cpp:
        * tao/TransportCurrent/Current_Loader.cpp:
        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
        * tao/Transport_Cache_Manager_T.cpp:
        * tao/Transport_Connector.cpp:
        * tao/Transport_Descriptor_Interface.cpp:
        * tao/Transport_Mux_Strategy.cpp:
        * tao/TypeCodeFactory/Recursive_TypeCode.cpp:
        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp:
        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
        * tao/TypeCodeFactory_Adapter.cpp:
        * tao/UserException.cpp:
        * tao/Utils/Implicit_Deactivator.cpp:
        * tao/Utils/ORB_Destroyer.cpp:
        * tao/Utils/ORB_Manager.cpp:
        * tao/Utils/PolicyList_Destroyer.cpp:
        * tao/Utils/Servant_Var.cpp:
        * tao/Utils/Synch_Refcountable.cpp:
        * tao/Valuetype_Adapter.cpp:
        * tao/Valuetype_Adapter_Factory.cpp:
        * tao/Wait_On_LF_No_Upcall.cpp:
        * tao/Wait_On_Leader_Follower.cpp:
        * tao/Wait_On_Reactor.cpp:
        * tao/Wait_On_Read.cpp:
        * tao/Wait_Strategy.cpp:
        * tao/XtResource/XtResource_Factory.cpp:
        * tao/XtResource/XtResource_Loader.cpp:
        * tao/ZIOP/ZIOP.cpp:
        * tao/ZIOP/ZIOP_ORBInitializer.cpp:
        * tao/ZIOP/ZIOP_PolicyFactory.cpp:
        * tao/ZIOP/ZIOP_Policy_Validator.cpp:
        * tao/ZIOP/ZIOP_Policy_i.cpp:
        * tao/ZIOP/ZIOP_Service_Context_Handler.cpp:
        * tao/ZIOP/ZIOP_Stub.cpp:
        * tao/ZIOP/ZIOP_Stub_Factory.cpp:
        * tao/debug.cpp:
        * tao/default_client.cpp:
        * tao/default_resource.cpp:
        * tao/default_server.cpp:
        * tao/operation_details.cpp:
        * tao/params.cpp:
        * tao/target_specification.cpp:
          Removed ACE_RCSID

        * tests/Bug_1361_Regression/Server_Thread_Pool.cpp:
          Initialise pointer with 0

        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h:
        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp:
          Use ACE_Atomic_Op

        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.h:
        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp:
          Use ACE_GUARD

        * tests/Faults/client.cpp:
          Don't use ACE_UNUSED_ARG

        * tests/Oneway_Send_Timeouts/Test_i.cpp:
          Unicode fix

528 files changed, 464 insertions, 2366 deletions

diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 46090112a7e..a4261f4c985 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Abstract_Servant_Base.h"
 
-ACE_RCSID (tao,
-           Abstract_Servant_Base,
-           "$Id$")
-
 #if !defined(__ACE_INLINE__)
 #include "tao/Abstract_Servant_Base.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
index e0412bc4c07..ac35c2e3981 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -1,9 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Acceptor_Filter.h"
 
-ACE_RCSID(tao, Acceptor_Filter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 1e1b85c8be3..3cff0a4c872 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -24,11 +24,6 @@
 #include "tao/Acceptor_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Acceptor_Registry,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index d85ab3b7bac..2457a4ac145 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Adapter.h"
 
-ACE_RCSID (tao,
-           Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter::~TAO_Adapter (void)
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 4b9d5a7a6e2..21ce5a21138 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -12,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           Adapter_Registry,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index 8c80bcb81d3..931e668c137 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -15,10 +16,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (AnyTypeCode,
-           Alias_TypeCode_Static,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 8cd963b628e..279f45ff238 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any.h"
@@ -20,10 +21,6 @@
 # include "tao/AnyTypeCode/Any.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (AnyTypeCode,
-           Any,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 using namespace TAO;
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index bcd8f3c8680..be009e7905e 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
@@ -6,10 +7,6 @@
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (AnyTypeCode,
-           TAO_AnyTypeCode_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #define STANDARD_EXCEPTION_LIST \
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 2084f935aa1..e90b3cd1162 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Basic_Impl.h"
@@ -10,10 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (AnyTypeCode,
-           Any_Basic_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index cd8a8925a36..bc5273c536b 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Impl.h"
@@ -9,11 +10,6 @@
 
 #include "ace/Guard_T.h"
 
-ACE_RCSID (AnyTypeCode,
-           Any_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index ef44c4ff664..2d6f2f7eda5 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_SystemException.h"
@@ -13,11 +14,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (AnyTypeCode,
-           Any_SystemException,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index cf5d51f9356..00656c63098 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -12,10 +13,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (AnyTypeCode,
-           Any_Unknown_IDL_Type,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Unknown_IDL_Type::LOCK const
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 85ef4a595f1..649ec18e4c5 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
@@ -6,12 +7,6 @@
 # include "tao/AnyTypeCode/Empty_Param_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           Empty_Param_TypeCode,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 01fb53a3c4c..2c7480958c9 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
@@ -13,11 +14,6 @@
 # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           Enum_TypeCode_Static,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index 4d0d6668a94..36308a3c71f 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/ExceptionA.h"
@@ -14,11 +15,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (AnyTypeCode,
-           Exception,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Specializations for CORBA::Exception Any operators.
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index ca5c7b2dfc1..24ff25ac823 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -21,10 +21,6 @@
 # include "tao/AnyTypeCode/Marshal.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (AnyTypeCode,
-           Marshal,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Marshal_Object::~TAO_Marshal_Object (void)
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 511b0434c36..7b598020a9a 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -1,11 +1,7 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/AnyTypeCode/NVList_Adapter_Impl.h"
-
-ACE_RCSID (AnyTypeCode,
-           NVList_Adapter_Impl,
-           "$Id$")
-
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/SystemException.h"
 #include "ace/CORBA_macros.h"
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 179d6a684a9..d716a0d4f2e 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
@@ -14,11 +15,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AnyTypeCode,
-           Objref_TypeCode_Static,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index ff2b2db4bac..26f13c58fa0 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
@@ -8,11 +9,6 @@
 # include "tao/AnyTypeCode/Sequence_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           Sequence_TypeCode_Static,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 0ce4bfdf600..aebe8ea7129 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
@@ -8,12 +9,6 @@
 # include "tao/AnyTypeCode/String_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           String_TypeCode_Static,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 028e5f5571b..c9076fa66fb 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
@@ -14,12 +15,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-
-ACE_RCSID (AnyTypeCode,
-           Struct_TypeCode_Static,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
index 61aa6cd380f..f7e90ee5d92 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/SystemExceptionA.h"
@@ -12,11 +13,6 @@
 
 #include "tao/CORBA_String.h"
 
-ACE_RCSID (AnyTypeCode,
-           SystemExceptionA,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (THREAD_CANCELLED)
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 7c88dcd4577..3d96b379e56 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
@@ -6,11 +7,6 @@
 # include  "True_RefCount_Policy.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           True_RefCount_Policy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
diff --git a/TAO/tao/AnyTypeCode/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
index ca3156f5d15..eed874a1f1d 100644
--- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
@@ -1,14 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-
-ACE_RCSID (AnyTypeCode,
-           TypeCode,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index ff668fb917e..c2877a339d8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h"
@@ -28,11 +29,6 @@
 #include "ace/Array_Base.h"
 #include "ace/Value_Ptr.h"
 
-
-ACE_RCSID (AnyTypeCode,
-           TypeCode_CDR_Extraction,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
index cc156f63533..edbed74e78e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -1,14 +1,7 @@
+// -*- C++ -*-
 // $Id$
 
-
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
-
-
-ACE_RCSID (AnyTypeCode,
-           TypeCode_Constants,
-           "$Id$")
-
-
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 005506f34fe..6a2c7128cf7 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Union_TypeCode_Static.h"
@@ -12,11 +13,6 @@
 #include "ace/Value_Ptr.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (AnyTypeCode,
-           Union_TypeCode_Static,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 84536062264..50d4ccf6c68 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
@@ -14,11 +15,6 @@
 # include "tao/AnyTypeCode/Value_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-
-ACE_RCSID (AnyTypeCode,
-           Value_TypeCode_Static,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index cd4a7d18567..8aa760c8064 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file     append.cpp
@@ -29,10 +28,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (AnyTypeCode,
-           append,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Encode instances of arbitrary data types based only on typecode.
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index c8c4c2ecab8..0741c2e62d5 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -29,10 +29,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (AnyTypeCode,
-           skip,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::traverse_status
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
index d9da63d780f..96f855bed87 100644
--- a/TAO/tao/AnyTypeCode_Adapter.cpp
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/AnyTypeCode_Adapter.h"
 
-ACE_RCSID (tao,
-           TAO_AnyTypeCode_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void)
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index 9ee9a6e8739..8ea09608617 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Asynch_Queued_Message.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -10,10 +13,6 @@
 #include "ace/Malloc_Base.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (tao,
-           Asynch_Queued_Message,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index 1ed5613102e..9e446e1c31b 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -10,10 +10,6 @@
 #include "tao/Asynch_Reply_Dispatcher_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Asynch_Reply_Dispatcher_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 9433bfa562d..01754449b5a 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -7,10 +7,6 @@
 # include "tao/Base_Transport_Property.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Base_Transport_Property,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void)
diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp
index b564942d5db..4ad90e15473 100644
--- a/TAO/tao/BiDir_Adapter.cpp
+++ b/TAO/tao/BiDir_Adapter.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/BiDir_Adapter.h"
 
-ACE_RCSID(tao, BiDir_Adapter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void)
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 93eeb28ba20..709567cb06e 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
@@ -6,12 +9,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (BiDir_GIOP,
-           BiDirGIOP,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
   : initialized_ (false)
 {
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index d0bff88c6b7..71e17e7cb05 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -1,12 +1,11 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
 #include "tao/BiDir_GIOP/BiDir_Policy_i.h"
 #include "tao/Policy_Set.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (BiDir_GIOP,
-           BiDirPolicy_Validator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 1ec6cfcbed0..9de4075a3ab 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -11,10 +11,6 @@
 
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (BiDir_GIOP,
-           BiDir_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 03559f68670..18dc40e0995 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,16 +1,13 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/BiDir_GIOP/BiDir_Policy_i.h"
-
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
-
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (BiDir_GIOP,
-           BiDir_PolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index 00b87d8026d..cd328dc8a56 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -8,10 +8,6 @@
 
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (BiDir_GIOP,
-           BiDir_Policy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
index 447b62f147e..27c4a113dea 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/BiDir_GIOP/BiDir_Service_Context_Handler.h"
-
-ACE_RCSID (BiDir_GIOP,
-           BiDir_Service_Context_Handler,
-           "$Id$")
-
 #include "tao/CDR.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/Transport.h"
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
index 8acc7125cc1..8efa32be24d 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Bind_Dispatcher_Guard.h"
@@ -7,10 +7,6 @@
 # include "tao/Bind_Dispatcher_Guard.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Bind_Dispatcher_Guard,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id,
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
index ce17445599d..da95bb25641 100644
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -6,8 +6,6 @@
 #include "tao/Connection_Handler.h"
 #include "ace/Countdown_Time.h"
 
-ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index 6cd123fcf49..ecd5dc417b7 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "tao/Blocked_Connect_Strategy.h"
 #include "tao/Connection_Handler.h"
 
 #include "ace/Synch_Options.h"
 
-ACE_RCSID(tao,
-          Blocked_Connect_Strategy,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy (
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index e2f77d0b30d..1c1b24bc9f3 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -10,12 +10,6 @@
 # include "tao/CDR.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           CDR,
-           "$Id$")
-
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_CDR_Timeprobe_Description[] =
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 901cd0159b3..f65a2810e7d 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/CORBALOC_Parser.h"
 
 #if (TAO_HAS_CORBALOC_PARSER == 1)
@@ -20,10 +23,6 @@
 #include "tao/CORBALOC_Parser.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           CORBALOC_Parser,
-           "$Id$")
-
 static const char prefix[] = "corbaloc:";
 static const size_t prefix_len = sizeof prefix - 1;
 static const char rir_token[] = "rir:";
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index f1787d50852..803c86975f2 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/CORBA_String.h"
 #include "tao/String_Manager_T.h"
 
@@ -12,10 +14,6 @@
 # include "tao/CORBA_String.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           CORBA_String,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // *************************************************************
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index bcb0e31e1a1..828be978ab1 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
@@ -5,11 +6,6 @@
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(CSD_Framework,
-          CSD_Default_Servant_Dispatcher,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 7d35160ec1f..df33e5462b9 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -1,4 +1,6 @@
+// -*- C++ -*-
 // $Id$
+
 #include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -6,11 +8,6 @@
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
-
-ACE_RCSID (CSD_Framework,
-           FW_Server_Request_Wrapper,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 4d2f47e09ec..62f9d46786c 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Framework_Loader.h"
@@ -6,11 +7,6 @@
 #include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/PI/DLL_Resident_ORB_Initializer.h"
 #include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Framework_Loader,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
index ed67d4ce592..bd92317f7ed 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
@@ -1,10 +1,7 @@
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
-
-ACE_RCSID (CSD,
-           CSD_ORBInitializer,
-           "$Id$")
-
+// -*- C++ -*-
+// $Id$
 
+#include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index b9c56ea4445..1daba9b08e5 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Object_Adapter.h"
 #include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/CSD_Framework/CSD_POA.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index d62b5e0928f..11ff051f409 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
@@ -8,11 +9,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void)
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index 5f53d9bd76d..8321b598f38 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_POA.h"
@@ -6,10 +7,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_POA,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_POA.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index b59ef04eef4..6edc8f51d44 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Base.h"
@@ -8,10 +9,6 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/TAO_Server_Request.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_Strategy_Base.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
index b163134be56..cafa923b557 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
@@ -1,14 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
index a722c13d7ad..b5159cd97f9 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
@@ -1,13 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Strategy_Repository::TAO_CSD_Strategy_Repository()
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
index 35b6b316012..d110dcf1d2c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
@@ -3,10 +3,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 
-ACE_RCSID (CSD_TP,
-           Cancel_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
index ff94e678bb3..f057b02c081 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Asynch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index aff5665bd2b..f843aa38fec 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_Request,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
index 1da58c328c0..b9f006f86d4 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_With_Server_Request,
-           "$Id$")
-
 #include "tao/Exception.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
index ff2aa4709c9..7c3642e1bf6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Corba_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
index 603f8eae77a..0f1b8328510 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Asynch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
index fbe24fc0c53..6ae6061aef8 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
index e2702b6c5a5..fff0638958b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request_Operation,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
index 287e516d7b4..c2e358de401 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Synch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
index aeb5454c252..ca87f1893ad 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
 
-ACE_RCSID (CSD_TP,
-           Dispatchable_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
index cb7b0ecf8e1..87edf4b4c13 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
@@ -4,10 +4,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Queue.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
index 3ede8818521..8ef0a64ac09 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
index 036a804beac..674e4441c52 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Remote_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -16,7 +12,6 @@ TAO::CSD::TP_Remote_Request::~TP_Remote_Request()
 {
 }
 
-
 void
 TAO::CSD::TP_Remote_Request::prepare_for_queue_i()
 {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
index e1926f93e8b..8613bfdac99 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
index 28fbc8da7ba..f50e3d25773 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
 
-ACE_RCSID (CSD_TP,
-           Servant_State,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
index 846f3a6e723..80c94043679 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
 
-ACE_RCSID (CSD_TP,
-           Servant_State_Map,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 93e6b1fbc33..14d8bc204af 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -10,10 +10,6 @@
 #include "ace/Trace.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index 263b7fd0b09..a1e7be7af59 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -8,10 +8,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::CSD::TP_Strategy_Factory::TP_Strategy_Factory()
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
index 79a0a195097..12768d5db7c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Synch_Helper,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index cef6fe53ec0..2d6a7413e2c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -79,9 +79,6 @@ namespace TAO
       /// Thread lock type
       typedef TAO_SYNCH_MUTEX LockType;
 
-      /// Thread guard type
-      typedef ACE_Guard<LockType> GuardType;
-
       /// Thread condition type
       typedef TAO_Condition<LockType> ConditionType;
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
index f4c5a1380c1..75b20ee9426 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,7 +21,7 @@ ACE_INLINE
 bool
 TAO::CSD::TP_Synch_Helper::wait_while_pending()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
 
   while (this->state_ == PENDING)
     {
@@ -37,7 +36,7 @@ ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::dispatched()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
   this->state_ = DISPATCHED;
   this->condition_.signal();
 }
@@ -47,7 +46,7 @@ ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::cancelled()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
   this->state_ = CANCELLED;
   this->condition_.signal();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index 7ecbac2c473..659bfb6c67f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -5,10 +5,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Task,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Task.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -23,8 +19,8 @@ TAO::CSD::TP_Task::~TP_Task()
 bool
 TAO::CSD::TP_Task::add_request(TP_Request* request)
 {
-  GuardType guard(this->lock_);
-
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
+  
   if (!this->accepting_requests_)
     {
       ACE_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - "
@@ -91,7 +87,7 @@ TAO::CSD::TP_Task::open(void* num_threads_ptr)
     }
 
   // We need the lock acquired from here on out.
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1);
 
   // We can assume that we are in the proper state to handle this open()
   // call as long as we haven't been open()'ed before.
@@ -139,7 +135,7 @@ TAO::CSD::TP_Task::svc()
   // Account for this current worker thread having started the
   // execution of this svc() method.
   {
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
     // Put the thread id into a collection which is used to check whether
     // the orb shutdown is called by one of the threads in the pool.
     ACE_thread_t thr_id = ACE_OS::thr_self ();
@@ -160,7 +156,7 @@ TAO::CSD::TP_Task::svc()
       // Do the "GetWork" step.
       {
         // Acquire the lock until just before we decide to "PerformWork".
-        GuardType guard(this->lock_);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
         // Start the "GetWork" loop.
         while (request.is_nil())
@@ -219,7 +215,7 @@ TAO::CSD::TP_Task::svc()
       // worker threads that there may be some dispatchable requests in the
       // queue now for this not-busy servant.  We need the lock_ to do this.
       {
-        GuardType guard(this->lock_);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
         request->mark_as_ready();
         this->work_available_.signal();
       }
@@ -239,7 +235,7 @@ TAO::CSD::TP_Task::svc()
 int
 TAO::CSD::TP_Task::close(u_long flag)
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   if (flag == 0)
     {
@@ -307,8 +303,8 @@ TAO::CSD::TP_Task::close(u_long flag)
 void
 TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant)
 {
-  GuardType guard(this->lock_);
-
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
+  
   // Cancel the requests targeted for the provided servant.
   TP_Cancel_Visitor cancel_visitor(servant);
   this->queue_.accept_visitor(cancel_visitor);
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
index 8d100f0c817..fea7b2ecc4e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -107,7 +107,6 @@ namespace TAO
     private:
 
       typedef TAO_SYNCH_MUTEX         LockType;
-      typedef ACE_Guard<LockType>     GuardType;
       typedef TAO_Condition<LockType> ConditionType;
 
       /// Lock to protect the "state" (all of the data members) of this object.
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index 72d4e72d7e7..714fc06be16 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Cleanup_Func_Registry.h"
 
 #if !defined (__ACE_INLINE__)
@@ -6,10 +8,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tao,
-           Cleanup_Func_Registry,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index bf3d334201e..7fca1d44e7f 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -1,8 +1,6 @@
-#include "tao/ClientRequestInterceptor_Adapter.h"
+// $Id$
 
-ACE_RCSID (tao,
-           ClientInterceptorAdapter,
-           "$Id$")
+#include "tao/ClientRequestInterceptor_Adapter.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
index ee3178eea83..4552cb8c328 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -1,8 +1,6 @@
-#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+// $Id$
 
-ACE_RCSID (tao,
-           ClientRequestInterceptorAdapterFactory,
-           "$Id$")
+#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index da5a118fbbd..aae2ca94ca0 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -1,9 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Client_Strategy_Factory.h"
 
-ACE_RCSID(tao, Client_Strategy_Factory, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 0402bfc6aea..d7273597983 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -1,12 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Codeset_Manager.h"
 #include "tao/Codeset_Descriptor_Base.h"
 
-ACE_RCSID (tao,
-           Codeset_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Codeset_Manager::~TAO_Codeset_Manager (void)
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index f898c3bfe53..1e5c29e5fc7 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/ORB_Core.h"
 #include "tao/Codeset_Manager.h"
 #include "tao/Codeset_Manager_Factory_Base.h"
 
-ACE_RCSID (tao,
-           Codeset_Manager_Factory_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void)
diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp
index b6a863d3829..d0a2cc943ff 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -5,12 +5,10 @@
  *  @file    Codeset_Translator_Base.cpp
  *
  *  $Id$
-
  *
  * factories are responsible for supplying the proper translator on
  * demand.
  *
- *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
 //=============================================================================
@@ -18,10 +16,6 @@
 
 #include "tao/Codeset_Translator_Base.h"
 
-ACE_RCSID (tao,
-           Codeset_Translator_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void)
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index bd696bbbfa8..3ada6823af2 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Collocated_Invocation.h"
 #include "tao/Collocation_Proxy_Broker.h"
 #include "tao/ORB_Core.h"
@@ -12,11 +14,6 @@
 # include "tao/PortableInterceptorC.h"
 #endif /*TAO_HAS_INTERCEPTORS */
 
-ACE_RCSID (tao,
-           Collocated_Invocation,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp
index e2c0653139f..ea46473b3ee 100644
--- a/TAO/tao/Collocation_Proxy_Broker.cpp
+++ b/TAO/tao/Collocation_Proxy_Broker.cpp
@@ -1,13 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Collocation_Proxy_Broker.h"
 
-
-ACE_RCSID (tao,
-           Collocation_Proxy_Broker,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void)
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index 23d15bfc269..e799cd12f20 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Collocation_Resolver.h"
 
-ACE_RCSID (tao,
-           Collocation_Resolver,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
index 47ea5b3a1df..5a5e1bdb6e1 100644
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ b/TAO/tao/Compression/Base_Compressor.cpp
@@ -1,8 +1,6 @@
-#include "tao/Compression/Base_Compressor.h"
+// $Id$
 
-ACE_RCSID (Compression,
-           Base_Compressor,
-           "$Id$")
+#include "tao/Compression/Base_Compressor.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index eb6a5ca34f9..d98a497c93f 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/Compression_Manager.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Compression,
-           Compression,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index 035a9c2a95e..da8d1f7d739 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -1,9 +1,6 @@
-#include "tao/Compression/Compression_Manager.h"
-
-ACE_RCSID (Compression,
-           Compression_Manager,
-           "$Id$")
+// $Id$
 
+#include "tao/Compression/Compression_Manager.h"
 #include "tao/ORB_Constants.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index e43aab8be09..c55434f675f 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -1,8 +1,6 @@
-#include "tao/Compression/Compressor_Factory.h"
+// $Id$
 
-ACE_RCSID (Compression,
-           Compressor_Factory,
-           "$Id$")
+#include "tao/Compression/Compressor_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
index 7750e6f5962..4023f9948be 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
@@ -1,9 +1,6 @@
-#include "Bzip2Compressor.h"
-
-ACE_RCSID (BZIP2,
-           Bzip2Compressor,
-           "$Id$")
+// $Id$
 
+#include "Bzip2Compressor.h"
 #include "bzlib.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
index ee57dc00310..e6db98a9bfb 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 #include "tao/Compression/bzip2/Bzip2Compressor.h"
 
-ACE_RCSID (BZIP2,
-           Bzip2_Compressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Compression/lzo/LzoCompressor.cpp b/TAO/tao/Compression/lzo/LzoCompressor.cpp
index 6a3dbd16f13..2ea8bd2b151 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor.cpp
+++ b/TAO/tao/Compression/lzo/LzoCompressor.cpp
@@ -1,9 +1,6 @@
-#include "LzoCompressor.h"
-
-ACE_RCSID (LZO,
-           LzoCompressor,
-           "$Id$")
+// $Id$
 
+#include "LzoCompressor.h"
 #include <lzo1x.h>
 #include <lzoutil.h>
 
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
index 543c1064372..7d7415c9589 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
+++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
@@ -1,10 +1,7 @@
+// $Id$
+
 #include "tao/Compression/lzo/LzoCompressor_Factory.h"
 #include "tao/Compression/lzo/LzoCompressor.h"
-
-ACE_RCSID (LZO,
-           Lzo_Compressor_Factory,
-           "$Id$")
-
 #include <lzo1x.h>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
index b2c7a558fc5..6d48a9b7186 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
@@ -1,9 +1,6 @@
-#include "ZlibCompressor.h"
-
-ACE_RCSID (ZLIB,
-           ZlibCompressor,
-           "$Id$")
+// $Id$
 
+#include "ZlibCompressor.h"
 #include "zlib.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index 42cf805ad56..d34fde8a170 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Compression/zlib/ZlibCompressor_Factory.h"
 #include "tao/Compression/zlib/ZlibCompressor.h"
 
-ACE_RCSID (ZLIB,
-           ZlibCompressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Configurable_Refcount.cpp b/TAO/tao/Configurable_Refcount.cpp
index 44f5f7f6138..26c0753d175 100644
--- a/TAO/tao/Configurable_Refcount.cpp
+++ b/TAO/tao/Configurable_Refcount.cpp
@@ -1,9 +1,7 @@
+// $Id$
+
 #include "Configurable_Refcount.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Configurable_Refcount.inl"
 #endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Configurable_Refcount,
-           "$Id$")
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index a22dfa5e857..29de7c32653 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -282,13 +282,21 @@ TAO_Connection_Handler::handle_input_internal (
     }
 
   if (return_value == -1)
-    resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
+    {
+      resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
+    }
+    
   return return_value;
 }
 
 int
 TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
 {
+  if (this->is_closed_)
+    {
+      return 1;
+    }
+    
   this->is_closed_ = true;
 
   // Save the ID for debugging messages
@@ -425,16 +433,19 @@ TAO_Connection_Handler::pos_io_hook (int &)
 int
 TAO_Connection_Handler::close_handler (u_long)
 {
-  this->is_closed_ = true;
-  
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
-                       this->orb_core_->leader_follower ());
+  if (!this->is_closed_)
+    {
+      this->is_closed_ = true;
 
-  // If there was a pending connection cancel it.
-  this->cancel_pending_connection ();
+      this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
+                            this->orb_core_->leader_follower ());
 
-  // Purge transport from cache if it's in cache.
-  this->transport ()->purge_entry();
+      // If there was a pending connection cancel it.
+      this->cancel_pending_connection ();
+
+      // Purge transport from cache if it's in cache.
+      this->transport ()->purge_entry();
+    }
 
   return 0;
 }
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
index 8bcf332a835..239c7a0352d 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -6,10 +6,6 @@
 # include "tao/Connection_Purging_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Connection_Purging_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void)
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index d24db801bb3..619ba114b4c 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -15,11 +15,6 @@
 #include "tao/Connector_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           Connector_Registry,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connector_Registry::TAO_Connector_Registry (void)
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index d2b4bba59bd..4842b89eedc 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -14,10 +14,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           DLL_Parser,
-           "$Id$")
-
 static const char dll_prefix[] = "DLL:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index 72e16367826..552d1ebf253 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/Default_Collocation_Resolver.h"
-
-ACE_RCSID (tao,
-           Default_Collocation_Resolver,
-           "$Id$")
-
 #include "tao/Object.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index 8f64a7f6bb3..bccea7d9b21 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -5,12 +5,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (tao,
-           Default_Endpoint_Selector_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 60208182270..ffb100c5fa6 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Default_Thread_Lane_Resources_Manager.h"
@@ -6,12 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (tao,
-           Default_Thread_Lane_Resources_Manager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 2eee3e406d8..8e5e61262b1 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -4,10 +4,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (DiffServPolicy,
-           Client_Network_Priority_Policy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
index f83f8c80b00..86ab39e17f5 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/DiffServPolicy/DiffServPolicy.h"
 #include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
@@ -7,8 +8,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/PI/PI.h"
 
-ACE_RCSID (DiffServPolicy, DiffServPolicy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
index 3fed4990ac9..d0e31f1ad7f 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
@@ -1,9 +1,7 @@
-#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
-
-ACE_RCSID (DiffServPolicy,
-           DiffServPolicy_Factory,
-           "$Id$")
+// -*- C++ -*-
+// $Id$
 
+#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
 #include "tao/PolicyC.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
index 100053ff8de..96a6354b72c 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
@@ -8,10 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServPolicy_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index 7a6c46706c8..fa4fd7a8f73 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h"
 #include "tao/PortableServer/Root_POA.h"
@@ -12,11 +13,6 @@
 #include "tao/Connection_Handler.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(DiffServPolicy,
-          DiffServ_Network_Priority_Hook,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
index e6157404590..4a6af6e6261 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -8,10 +11,6 @@
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServ_Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DS_Network_Priority_Protocols_Hooks::
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
index 6bd71b8a674..a1f5e4c873e 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/DiffServPolicy/DiffServ_Service_Context_Handler.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServ_Service_Context_Handler,
-           "$Id$")
-
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "tao/CDR.h"
 #include "tao/TAO_Server_Request.h"
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 6fdc297e2d8..d496ec141cc 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -5,10 +5,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (DiffServPolicy,
-           Server_Network_Priority_Policy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 497d93b86bc..7bdbc0e9660 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -23,10 +23,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (DynamicAny,
-           DynAnyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor from typecode
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index bce4d6ad6f6..8585ba2fcd1 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -14,10 +15,6 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (DynamicAny,
-           DynAny_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynAny_i::TAO_DynAny_i (void)
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 1c30d4a0c32..70abecc88e9 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynArray_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynArray_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynArray_i::TAO_DynArray_i (void)
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 4256113aa32..60eab3cb278 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
@@ -22,11 +23,6 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (DynamicAny,
-           DynCommon,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynCommon::TAO_DynCommon (void)
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index ac01dd4f7bd..1325a5a3053 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -9,11 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (DynamicAny,
-           DynEnum_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynEnum_i::TAO_DynEnum_i (void)
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index fcc700e0427..6ef16221c4f 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynSequence_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynSequence_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynSequence_i::TAO_DynSequence_i (void)
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index ab2d743b88d..4a01641c93b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynStruct_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynStruct_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynStruct_i::TAO_DynStruct_i (void)
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index b777fb5618d..99f50c6bf52 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynUnion_i.h"
@@ -11,10 +12,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynUnion_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynUnion_i::TAO_DynUnion_i (void)
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index 05ba084fdc3..de4dce9bf8c 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValueBox_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValueBox_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValueBox_i::TAO_DynValueBox_i (void)
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index 40de3f745ed..5414599eb2c 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValueCommon_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValueCommon_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValueCommon_i::TAO_DynValueCommon_i (void)
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 658d45c6638..45545248f4d 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValue_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValue_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValue_i::TAO_DynValue_i (void)
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index a1686020897..f53b177dbf4 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -12,8 +12,6 @@
 #include "tao/DynamicAny/DynamicAny.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
 
-ACE_RCSID(DynamicAny, DynamicAny, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 1b0282bee0a..82d61a2c887 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -14,9 +14,6 @@
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 
-ACE_RCSID (DynamicInterface, AMH_DSI_Response_Handler,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "AMH_DSI_Response_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index b1bb9f70399..380b77a0e7a 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -1,13 +1,9 @@
-#include "tao/DynamicInterface/Context.h"
-
-ACE_RCSID (DynamicInterface,
-           Context,
-           "$Id$")
+// $Id$
 
+#include "tao/DynamicInterface/Context.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
-
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 392390a809c..6f955615445 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -1,18 +1,12 @@
 // $Id$
 
 #include "tao/DynamicInterface/DII_Arguments.h"
-
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
 
-
-ACE_RCSID (DynamicInterface,
-           DII_Arguments,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/DynamicInterface/DII_Arguments.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index 846a8ae204a..ee2614bd222 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -7,10 +7,6 @@
 #include "tao/SystemException.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicInterface,
-           DII_Arguments_Converter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index f887b414ec0..2c6a8a8c1e3 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -24,10 +24,6 @@
 # include "tao/PI/RequestInfo_Util.h"
 #endif
 
-ACE_RCSID (DynamicInterface,
-           DII_Invocation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index efcc31ba283..8410e8eb9ea 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -18,11 +18,6 @@
 
 #include "ace/os_include/os_errno.h"
 
-ACE_RCSID (DynamicInterface,
-           DII_Invocation_Adapter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 4d28e8f3b51..c4694a26f57 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -7,11 +7,6 @@
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID(DynamicInterface,
-          DII_Reply_Dispatcher,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
index 944fd405701..37d5d882cde 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -10,8 +10,6 @@
 #include "tao/Object.h"
 #include "tao/Pluggable_Messaging_Utils.h"
 
-ACE_RCSID(DynamicInterface, Request, "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "DII_Reply_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 57a453ed077..654b3caf287 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
-
-ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
-
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index b3fa6df1a91..a9495f3b888 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,10 +1,7 @@
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
-
-ACE_RCSID (DynamicInterface,
-           Dynamic_Implementation,
-           "$Id$")
-
+// -*- C++ -*-
+// $Id$
 
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 74dffaef6b4..a594cf34feb 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -1,9 +1,6 @@
-#include "tao/DynamicInterface/ExceptionList.h"
-
-ACE_RCSID (DynamicInterface,
-           ExceptionList,
-           "$Id$")
+// $Id$
 
+#include "tao/DynamicInterface/ExceptionList.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/SystemException.h"
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 0764f125b9c..ea2f72c6ad3 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/DynamicInterface/Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Request,
-           "$Id$")
-
 #include "tao/DynamicInterface/DII_Invocation_Adapter.h"
 #include "tao/DynamicInterface/DII_Arguments.h"
 #include "tao/DynamicInterface/Context.h"
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 018c56c5e75..61fcdf1b15d 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -3,11 +3,6 @@
 // Implementation of the Dynamic Server Skeleton Interface.
 
 #include "tao/DynamicInterface/Server_Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Server_Request,
-           "$Id$")
-
 #include "tao/DynamicInterface/DII_Arguments.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "tao/PortableServer/Collocated_Arguments_Converter.h"
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 1208f1d64de..40baeaaed0c 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -12,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (DynamicInterface,
-           Unknown_User_Exception,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::UnknownUserException::UnknownUserException (void)
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index 7e4a4ab96aa..d032903f040 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Dynamic_Adapter.h"
 
-ACE_RCSID (tao,
-           Dynamic_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index b751c6fcdb0..0cb19d5ebaa 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -7,10 +7,6 @@
 #include "tao/Endpoint.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Endpoint,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Endpoint::~TAO_Endpoint (void)
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index f1b7ccbdec7..c805449278d 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/EndpointPolicy.h"
 #include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
@@ -9,8 +10,6 @@
 
 #include "tao/PI/PI.h"
 
-ACE_RCSID (EndpointPolicy, EndpointPolicy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index baa57006a0c..2f9a9003500 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -1,9 +1,7 @@
-// @(#) $Id$
-#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_Factory,
-           "$Id$")
+#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
 
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
 #include "tao/EndpointPolicy/EndpointPolicyA.h"
@@ -20,7 +18,6 @@ ACE_RCSID (EndpointPolicy,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
   : orb_core_ (orb_core)
 {
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index 3a60e15a0f0..3f77a792301 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -7,10 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 9c0b57706e8..ee5b1837fc5 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -3,10 +3,6 @@
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value)
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
index a28f38e0580..c90af733458 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
 #include "tao/EndpointPolicy/EndpointPolicyC.h"
@@ -9,11 +10,6 @@
 #include "tao/Profile.h"
 #include "tao/Endpoint.h"
 
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Endpoint_Acceptor_Filter::TAO_Endpoint_Acceptor_Filter (const EndpointPolicy::EndpointList & eps)
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
index 561b045e96f..a8ff981c859 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
@@ -6,11 +7,6 @@
 #include "tao/PortableServer/POAManager.h"
 #include "tao/EndpointPolicy/EndpointPolicyC.h"
 
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter_Factory,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index 40397b106c9..df661b189a8 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
 
@@ -8,10 +9,6 @@
 #include "tao/IIOP_Acceptor.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (IIOPEndpointValue,
-           IIOPEndpointValue_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 IIOPEndpointValue_i::IIOPEndpointValue_i ()
diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp
index 6fc44b4efcc..3b0f2bdb3d8 100644
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Endpoint_Selector_Factory.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Endpoint_Selector_Factory.h"
 
-ACE_RCSID (tao,
-           Endpoint_Selector_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void)
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 5d648d011f8..99066477aa2 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Exception.h"
@@ -25,11 +26,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (tao,
-           Exception,
-           "$Id$")
-
-
 // ****************************************************************
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index f8077d17ba8..3d5f604cbb7 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -5,10 +5,6 @@
 #include "tao/debug.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (tao,
-           Exclusive_TMS,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 643675b466a..f0cfad69d50 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -13,10 +13,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           FILE_Parser,
-           "$Id$")
-
 static const char file_prefix[] = "file:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp
index 75aa4511b5b..a6db441e026 100644
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ b/TAO/tao/Fault_Tolerance_Service.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Fault_Tolerance_Service.h"
 #include "tao/Services_Activate.h"
 #include "tao/ORB_Core.h"
@@ -9,10 +11,6 @@
 # include "tao/Fault_Tolerance_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Fault_Tolerance_Service,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void)
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
index 6d66ee99975..d6d754daf62 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -2,11 +2,6 @@
 
 #include "tao/Flushing_Strategy.h"
 
-ACE_RCSID (tao, 
-           Flushing_Strategy, 
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp
index 14a126aa169..e4bd6cb5a9d 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp
@@ -4,11 +4,6 @@
 #include "tao/debug.h"
 #include "ace/FoxReactor/FoxReactor.h"
 
-ACE_RCSID( TAO_FoxResource,
-           FoxResource_Factory,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.cpp b/TAO/tao/FoxResource/FoxResource_Loader.cpp
index 927e3338ec5..31be07916ba 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Loader.cpp
@@ -1,13 +1,9 @@
 //$Id$
+
 #include "tao/FoxResource/FoxResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/FoxResource/FoxResource_Factory.h"
 
-ACE_RCSID( TAO_FoxResource,
-           FoxResource_Loader,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 8c2c725c7d7..ae1928bdd76 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/GIOP_Message_Base.h"
@@ -20,10 +21,6 @@
  */
 //@@ GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK
 
-ACE_RCSID (tao,
-           GIOP_Message_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
index 016a12626c7..1d5e742d0e3 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -1,8 +1,7 @@
-#include "tao/GIOP_Message_Generator_Parser_11.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID (tao,
-           GIOP_Message_Generator_Parser_11,
-           "$Id$")
+#include "tao/GIOP_Message_Generator_Parser_11.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index bf4a01631b5..72a32f0b871 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/GIOP_Message_Generator_Parser_12.h"
 #include "tao/GIOPC.h"
 #include "tao/GIOP_Utils.h"
@@ -12,10 +15,6 @@
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (tao,
-           GIOP_Message_Gen_Parser_12,
-           "$Id$")
-
 // This is used by GIOP1.2. This is to align the message body on a
 // 8-octet boundary. This is declared static so that it is in file
 // scope.
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
index 37842a51970..10e59dcc1e3 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
@@ -1,9 +1,8 @@
+// $Id$
+
 #include "tao/GIOP_Message_Generator_Parser_Impl.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Generator_Parser_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           GIOP_Message_Generator_Parser_Impl, 
-           "$Id$")
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
index 4694fc651eb..06da7d61ca6 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -6,6 +6,3 @@
 # include "tao/GIOP_Message_Locate_Header.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           GIOP_Message_Locate_Header,
-           "$Id$")
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index c4265219b9d..c9ff4f18ce5 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -10,10 +10,6 @@
 # include "tao/GIOP_Message_State.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           GIOP_Message_State,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp
index b7935f7ac71..96de7723086 100644
--- a/TAO/tao/GIOP_Message_Version.cpp
+++ b/TAO/tao/GIOP_Message_Version.cpp
@@ -1,10 +1,9 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 # include "tao/GIOP_Message_Version.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Version.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           GIOP_Message_Version, 
-           "$Id$")
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 50ed7114ec0..8c13007d25b 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           HTTP_Parser,
-           "$Id$")
-
 static const ACE_TCHAR file_prefix[] = ACE_TEXT ("http:");
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 1ebfa2ca0df..400aa68fe42 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IFR_Client_Adapter.h"
 
-ACE_RCSID (tao,
-           IFR_Client_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IFR_Client_Adapter::~TAO_IFR_Client_Adapter ()
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 6e007a4e283..bdbede71cad 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 /*
  * Hook to copy all include and forward declarations.
  */
@@ -23,10 +25,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (tao,
-           IIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 28ca24df31e..393a2b18438 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IIOP_Connector.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -19,10 +22,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           IIOP_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Uncomment *one* of the the following defines if you want to explicitly induce
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 5bb46b20d8d..e5ccf6b9183 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 /*
  * Add all include files within the following
  * two markers.
@@ -18,10 +21,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (tao,
-           IIOP_Endpoint,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/IIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 4ab9094bd05..e47b6ecf294 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IIOP_Profile.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -7,14 +10,8 @@
 #include "tao/IIOP_EndpointsC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
-
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
-
-ACE_RCSID (tao,
-           IIOP_Profile,
-           "$Id$")
-
 #include "ace/os_include/os_netdb.h"
 
 static const char the_prefix[] = "iiop";
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 9683b4292e2..7cadc0eddcb 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/IIOP_Transport.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -17,10 +19,6 @@
 
 #include "ace/OS_NS_sys_sendfile.h"
 
-ACE_RCSID (tao,
-           IIOP_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
index 7759e6793f3..5cb74c50eef 100644
--- a/TAO/tao/IORInterceptor_Adapter.cpp
+++ b/TAO/tao/IORInterceptor_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/IORInterceptor_Adapter.h"
 
-ACE_RCSID (tao,
-           IORInterceptor_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void)
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
index 083299eeb96..ccbcaea3879 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "tao/IORInterceptor_Adapter_Factory.h"
 
-ACE_RCSID (tao,
-           IORInterceptor_Adapter_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void)
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.cpp b/TAO/tao/IORManipulation/IORManip_Filter.cpp
index 3f70b119f08..2200f1b154c 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Filter.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (IORManip_Filter, IORManip_Filter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_Filter::TAO_IORManip_Filter (void)
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 211e85c6a6e..ceb9bb1c958 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -9,8 +9,6 @@
 #include "tao/MProfile.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (IORManip_IIOP_Filter, IORManip_IIOP_Filter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter (void)
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 90bfb074d04..11fd191b7b6 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -3,12 +3,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (IORManipulation,
-           IORManip_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_Loader::TAO_IORManip_Loader (void)
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 887c8735382..adec109450c 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IORManipulation/IORManipulation.h"
 
 #include "tao/MProfile.h"
@@ -8,11 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (IORManipulation,
-           IORManipulation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
index e43ccf18b34..e7bd0d9445a 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -14,9 +14,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/IORTable/Table_Adapter.h"
 
-ACE_RCSID (IORTable, IORTable, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 132144ddd86..64e1ead30b5 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -10,11 +10,6 @@
 #include "tao/IORTable/IOR_Table_Impl.h"
 #include "ace/Guard_T.h"
 
-ACE_RCSID (IORTable,
-           IOR_Table_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Table_Impl_ptr
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f455cdd962e..005db23e309 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -17,10 +17,6 @@
 #include "tao/Profile.h"
 #include "tao/TAO_Server_Request.h"
 
-ACE_RCSID (IORTable,
-           Table_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
index abc812d7f58..931f6ec6064 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -2,9 +2,6 @@
 
 #include "tao/IOR_Parser.h"
 
-ACE_RCSID(tao, IOR_Parser, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Parser::~TAO_IOR_Parser (void)
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 0d1335792ff..99c7f054849 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -11,10 +11,6 @@
 #include "tao/ImR_Client/ServerObject_i.h"
 #include "tao/ImR_Client/ImplRepoC.h"
 
-ACE_RCSID (ImR_Client,
-           ImR_Client,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 9a473dc5c33..d1eaeedaaae 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Incoming_Message_Queue.h"
 #include "tao/Queued_Data.h"
 #include "tao/debug.h"
@@ -9,10 +11,6 @@
 # include "tao/Incoming_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Incoming_Message_Queue,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
diff --git a/TAO/tao/Incoming_Message_Stack.cpp b/TAO/tao/Incoming_Message_Stack.cpp
index 2d5627fd3d5..9e50caeb7ea 100644
--- a/TAO/tao/Incoming_Message_Stack.cpp
+++ b/TAO/tao/Incoming_Message_Stack.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+// $Id$
 
 # include "tao/Incoming_Message_Stack.h"
 
@@ -5,7 +7,3 @@
 # include "tao/Incoming_Message_Stack.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Incoming_Message_Stack,
-           "$Id$")
-
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 2e68b8d7f28..0359a3efb57 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -352,8 +352,7 @@ namespace TAO
       nil_forward_ref = true;
     else
       {
-        stubobj =
-          effective_target->_stubobj ();
+        stubobj = effective_target->_stubobj ();
 
         if (stubobj && stubobj->base_profiles ().size () == 0)
           nil_forward_ref = true;
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 2a82fefcdff..5a8f80532bf 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Invocation_Base.h"
 #include "tao/Stub.h"
 #include "tao/operation_details.h"
@@ -15,10 +17,6 @@
 # include "tao/Invocation_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Invocation_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 1b9885e5ef6..752860ba877 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,4 +1,5 @@
 //$Id$
+
 #include "tao/Invocation_Endpoint_Selectors.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -9,12 +10,7 @@
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (tao,
-           Invocation_Endpoint_Selectors,
-           "$Id$")
-
-
-  TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
 {
diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp
index 85d7175b890..621f6a58946 100644
--- a/TAO/tao/LF_CH_Event.cpp
+++ b/TAO/tao/LF_CH_Event.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "tao/LF_CH_Event.h"
 #include "tao/LF_Follower.h"
 #include "tao/debug.h"
 #include "tao/Connection_Handler.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao,
-          LF_Invocation_Event,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_CH_Event::TAO_LF_CH_Event (void)
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index a52852f0529..0c6a0db73ba 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/LF_Connect_Strategy.h"
 #include "tao/LF_Multi_Event.h"
 #include "tao/Connection_Handler.h"
@@ -7,11 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Synch_Options.h"
 
-ACE_RCSID(tao,
-          LF_Connect_Strategy,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy (
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index f40ccdb1317..ee456aa9b48 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event.h"
@@ -9,10 +10,6 @@
 # include "tao/LF_Event.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           LF_Event,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Event::TAO_LF_Event (void)
diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp
index 6f59f2dd05b..4067f1fdaba 100644
--- a/TAO/tao/LF_Event_Binder.cpp
+++ b/TAO/tao/LF_Event_Binder.cpp
@@ -6,10 +6,6 @@
 # include "tao/LF_Event_Binder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           LF_Event_Binder,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void)
diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp
index 9e9cba91522..5ac84b65ca3 100644
--- a/TAO/tao/LF_Follower.cpp
+++ b/TAO/tao/LF_Follower.cpp
@@ -7,10 +7,6 @@
 # include "tao/LF_Follower.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           LF_Follower,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower)
diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp
index 4798d5c34c7..0c78eff0b80 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ b/TAO/tao/LF_Follower_Auto_Adder.cpp
@@ -6,10 +6,6 @@
 # include "tao/LF_Follower_Auto_Adder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           LF_Follower_Auto_Adder,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void)
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
index fc42ec084fc..acdd9feb2d4 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -1,9 +1,7 @@
 // -*- C++ -*-
-#include "tao/LF_Invocation_Event.h"
+// $Id$
 
-ACE_RCSID(tao,
-          LF_Invocation_Event,
-          "$Id$")
+#include "tao/LF_Invocation_Event.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp
index fa55eeeaefd..2e48265f82a 100644
--- a/TAO/tao/LF_Multi_Event.cpp
+++ b/TAO/tao/LF_Multi_Event.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/LF_Multi_Event.h"
 #include "tao/Connection_Handler.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID(tao,
-          LF_Multi_Event,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
index 8c30e4b4e96..1cb7fd5997b 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/LF_Strategy.h"
 
-ACE_RCSID (tao,
-           LF_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Strategy::~TAO_LF_Strategy (void)
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
index 687067af7c0..0019092a013 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -6,10 +6,6 @@
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tao,
-           LF_Strategy_Complete,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void)
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
index 2b2b1f9472a..dcc9871c567 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
@@ -3,10 +3,6 @@
 #include "tao/LRU_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (tao,
-           LRU_Connection_Purging_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy (
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 7524068d223..1d1688307b6 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -17,11 +17,6 @@
 # include "tao/Leader_Follower.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Leader_Follower,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Leader_Follower::~TAO_Leader_Follower (void)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index fe65035ab55..e6bd2d95513 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -7,11 +7,6 @@
 #include "tao/Queued_Message.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao,
-           Leader_Follower_Flushing_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 21b63f26cd7..9f12cff39d9 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -13,10 +13,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
 
-ACE_RCSID (tao,
-           LocalObject,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::LocalObject::~LocalObject (void)
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 722b30fa65b..e3b12883ae7 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/MCAST_Parser.h"
 
 #if (TAO_HAS_MCAST_PARSER == 1)
@@ -16,15 +18,8 @@
 #include "tao/MCAST_Parser.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           MCAST_Parser,
-           "$Id$")
-
-
 static const char mcast_prefix[] = "mcast:";
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_MCAST_Parser::~TAO_MCAST_Parser (void)
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index c4c763c7f6c..cef1f76f538 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
+
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 #include "tao/PolicyC.h"
@@ -11,10 +11,6 @@
 #include "ace/Guard_T.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           MProfile,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/MProfile.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index 021fcc69a3b..a7577787543 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -1,4 +1,6 @@
+// -*- C++ -*-
 // $Id$
+
 #include "tao/Messaging/AMI_Arguments_Converter_Impl.h"
 #include "tao/operation_details.h"
 #include "tao/SystemException.h"
@@ -6,10 +8,6 @@
 #include "tao/Reply_Dispatcher.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (Messaging,
-           AMI_Arguments_Converter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 7243dc28e76..642d4a4f10c 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Asynch_Invocation.h"
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
@@ -16,10 +17,6 @@
 # include "tao/PortableInterceptorC.h"
 #endif /*TAO_HAS_INTERCEPTORS */
 
-ACE_RCSID (Messaging,
-           Asynch_Invocation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 920493700b0..65036e25725 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Messaging/Asynch_Invocation_Adapter.h"
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 #include "tao/Messaging/Asynch_Invocation.h"
@@ -15,12 +17,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/GIOP_Utils.h"
 
-
-ACE_RCSID (Messaging,
-           Asynch_Invocation_Adapter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 9075cd3247c..90a1c4223a7 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
-
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index eaff4d4de82..423b420b006 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -1,16 +1,12 @@
+// -*- C++ -*-
 // $Id$
 
-
 #include "tao/Messaging/Asynch_Timeout_Handler.h"
 
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 #include "tao/Transport_Mux_Strategy.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID (Messaging,
-           Asynch_Timeout_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
index e01d7c229c2..86438d796e9 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
@@ -8,10 +8,6 @@
 #include "tao/SystemException.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (Messaging,
-           Buffering_Constraint_Policy,
-           "$Id$")
-
 #if ! defined (__ACE_INLINE__)
 #include "tao/Messaging/Buffering_Constraint_Policy.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 29c67610c42..41be84ff27c 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/ORB_Core.h"
@@ -8,11 +9,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Truncate.h"
 
-ACE_RCSID (Messaging,
-           Connection_Timeout_Policy_i,
-           "$Id$")
-
-
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index c9100b1c818..fbe923dbf53 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -3,10 +3,6 @@
 
 #include "tao/Messaging/ExceptionHolder_i.h"
 
-ACE_RCSID (Messaging,
-           ExceptionHolder_i,
-           "$Id$")
-
 #include "tao/Messaging/Messaging.h"
 #include "tao/Exception_Data.h"
 #include "tao/CDR.h"
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index a1c38d183a4..cf5ab688e61 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -6,10 +6,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (Messaging,
-           Messaging,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index a209e539fad..aa0b3323aa4 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/Messaging/Messaging_Loader.h"
@@ -9,9 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Messaging, Messaging_Loader, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Messaging_Loader::TAO_Messaging_Loader (void)
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index 1924e7b1e97..11544f753b4 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Messaging_ORBInitializer.h"
-
 #include "tao/Messaging/Messaging_Policy_i.h"
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/Messaging/Messaging_PolicyFactory.h"
@@ -12,10 +12,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/Valuetype/ValueFactory.h"
 
-ACE_RCSID (Messaging,
-           Messaging_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 5d1dad4b6ba..fa13e41c642 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,9 +1,7 @@
-#include "tao/Messaging/Messaging_PolicyFactory.h"
-
-ACE_RCSID (Messaging,
-           Messaging_PolicyFactory,
-           "$Id$")
+// -*- C++ -*-
+// $Id$
 
+#include "tao/Messaging/Messaging_PolicyFactory.h"
 #include "tao/Messaging/Messaging_Policy_i.h"
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/Messaging/Buffering_Constraint_Policy.h"
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index 6a8ea3a75bb..ea3cb9c66c3 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -11,10 +11,6 @@
 #include "tao/Messaging/Messaging_Policy_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Messaging,
-           Messaging_Policy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
index daf835d2cf7..90c0e441f7d 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
@@ -8,11 +8,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Messaging,
-           Messaging_Queueing_Strategies,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp
index 78109cd7f5a..735bba8cecd 100644
--- a/TAO/tao/Monitor/Monitor.cpp
+++ b/TAO/tao/Monitor/Monitor.cpp
@@ -1,10 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Monitor/Monitor.h"
 #include "tao/Monitor/Monitor_Impl.h"
 
-ACE_RCSID (Monitor,
-           Monitor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
diff --git a/TAO/tao/Monitor/Monitor_Impl.cpp b/TAO/tao/Monitor/Monitor_Impl.cpp
index 8823bb9d33a..5854fda6f04 100644
--- a/TAO/tao/Monitor/Monitor_Impl.cpp
+++ b/TAO/tao/Monitor/Monitor_Impl.cpp
@@ -1,6 +1,5 @@
-//
 // $Id$
-//
+
 #include "tao/Monitor/Monitor_Impl.h"
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
@@ -9,10 +8,6 @@
 #include "ace/Monitor_Control_Action.h"
 #include "ace/Monitor_Control/Monitor_Control.h"
 
-ACE_RCSID (Monitor,
-           Monitor_Impl,
-           "$Id$")
-
 class TAO_Control_Action : public Control_Action
 {
 public:
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 06036f4f116..81f2fb24a94 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -7,10 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
 
-ACE_RCSID (tao,
-           Muxed_TMS,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
index 063f473ac6d..96dc2e56a31 100644
--- a/TAO/tao/NVList_Adapter.cpp
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/NVList_Adapter.h"
 
-ACE_RCSID (tao,
-           NVList_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NVList_Adapter::~TAO_NVList_Adapter (void)
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.cpp b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
index 1f8e7ef4297..32c8cc7e6ce 100644
--- a/TAO/tao/Network_Priority_Protocols_Hooks.cpp
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Network_Priority_Protocols_Hooks.h"
 
-ACE_RCSID (tao,
-           Network_Priority_Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Network_Priority_Protocols_Hooks::
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 3f9023adf5a..459b2a4807d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,11 +1,6 @@
 // "$Id$"
 
 #include "tao/ORB.h"
-
-ACE_RCSID (tao,
-           ORB,
-           "$Id$")
-
 #include "tao/ORB_Table.h"
 #include "tao/Connector_Registry.h"
 #include "tao/IOR_Parser.h"
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 0a38bc35326..de84e437005 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORBInitializer_Registry_Adapter.h"
 #include "tao/PortableInterceptorC.h"
@@ -12,13 +14,6 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tao,
-           ORBInitializer_Registry,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
index 1798764e211..222581e8ea6 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/ORBInitializer_Registry_Adapter.h"
 
-ACE_RCSID (tao,
-           ORBInitializer_Registry_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 092e3a10528..df1c1db2eed 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -82,10 +82,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RCSID (tao,
-           ORB_Core,
-           "$Id$")
-
 ACE_STATIC_SVC_DEFINE(TAO_ORB_Core_Static_Resources,
                       ACE_TEXT ("TAO_ORB_Core_Static_Resources"),
                       ACE_SVC_OBJ_T,
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp
index 068897c2c38..dbfa1082fc3 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/ORB_Core_Auto_Ptr.h"
 #include "tao/ORB_Core.h"
 
@@ -5,10 +8,6 @@
 # include "tao/ORB_Core_Auto_Ptr.inl"
 #endif  /* !__ACE_INLINE */
 
-ACE_RCSID (tao,
-           ORB_Core_Auto_Ptr,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void)
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index f4f1d11e236..64ab01f4cff 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Singleton.h"
@@ -9,14 +11,6 @@
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (tao,
-           ORB_Table,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ORB_Table::ORB_Table (void)
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index d49005fa05b..3bb997409a4 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -4,10 +4,6 @@
 #include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
 #include "tao/PortableServer/Root_POA.h"
 
-ACE_RCSID (ORT,
-           ORT_Adapter_Factory_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index 266ed9542f6..b8247f25822 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -6,11 +6,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_methods.h"
 
-
-ACE_RCSID (ObjRefTemplate,
-           ORT_Adapter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 6dffcaa45b2..b39847e2161 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ORT,
-           ObjectReferenceTemplate_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index cd7e16d10f1..b4a287c1443 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -4,11 +4,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Refcounted_ObjectKey.h"
 
-ACE_RCSID(tao,
-          ObjectKey_Table,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index 5379fa97148..0318b7635fd 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -2,11 +2,6 @@
 
 #include "tao/Object_Loader.h"
 
-ACE_RCSID (tao,
-           Object_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Object_Loader::~TAO_Object_Loader (void)
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
index 8a8a1d6ee09..1f2a8687961 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Object_Proxy_Broker.h"
 
-ACE_RCSID (tao,
-           Object_Proxy_Broker,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void)
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index b40b3cded00..27140875d7d 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -8,18 +8,10 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (tao,
-           Object_Ref_Table,
-           "$Id$")
-
 #ifndef __ACE_INLINE__
 # include "tao/Object_Ref_Table.inl"
 #endif  /* __ACE_INLINE__ */
 
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index f806b51a0d0..1ba728063e3 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ClientRequestDetails.h"
 #include "tao/SystemException.h"
 
@@ -7,10 +9,6 @@
 #include "tao/PI/ClientRequestDetails.inl"
 #endif /* defined INLINE */
 
-ACE_RCSID (PI,
-           ClientRequestDetails,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index ed51f4b2d34..6204a586ca3 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -4,10 +4,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (PI,
-           ClientRequestInfo,
-           "$Id$")
-
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/ExceptionA.h"
 
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index c1981b13f60..1dd530b20d9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13,10 +15,6 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/PortableInterceptorC.h"
 
-ACE_RCSID (PI,
-           ClientRequestInterceptorAdapter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 6fe13dd9284..80f3fda2347 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -20,10 +20,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PI,
-           ClientRequestInterceptor_Factory_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ClientRequestInterceptor_Adapter*
diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp b/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp
index c7ffe953cd5..e2d115b9b92 100644
--- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp
+++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp
@@ -11,10 +11,6 @@
 
 #include "tao/PI/DLL_Resident_ORB_Initializer.h"
 
-ACE_RCSID (TAO,
-           DLL_Resident_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableInterceptor::DLL_Resident_ORB_Initializer::DLL_Resident_ORB_Initializer (
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 1a7b26bbfac..cb1f7e5b9da 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -14,10 +14,6 @@
 #include "tao/PI/PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-ACE_RCSID (PI,
-           ORBInitInfo,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "tao/PI/ORBInitInfo.inl"
 #endif /* defined INLINE */
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c95b18f1bd0..f39d9b646ea 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ORBInitializer_Registry_Impl.h"
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/PI/PICurrent.h"
@@ -14,11 +16,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (PI,
-           ORBInitializer_Registry,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 54b9891e22d..ee404ae02b5 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PI.h"
 #include "tao/PI/ORBInitializer_Registry_Impl.h"
 #include "tao/PI/PolicyFactory_Loader.h"
@@ -8,10 +10,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (PI,
-           PI,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 3d1793e9075..444457c3346 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/PI/PICurrent.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (tao,
-           PICurrent,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/PI/PICurrent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 7a78b7eeec6..cba4fc2913d 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/PI/PICurrent_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (tao,
-           PICurrent,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 804a577a4e3..4b1c949c3bf 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -21,10 +21,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PI,
-           PICurrent_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index 9ba41f28778..f76fe987f3d 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PI/PI_ORBInitializer.h"
 
@@ -12,10 +13,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RCSID (tao,
-           PI_ORBInitializer,
-           "$Id$")
-
 void
 TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
index ccb5a6a50da..cf5953d0f93 100644
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ b/TAO/tao/PI/PI_PolicyFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PI_PolicyFactory.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9,10 +11,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RCSID (tao,
-           PI_PolicyFactory,
-           "$Id$")
-
 CORBA::Policy_ptr
 TAO_PI_PolicyFactory::create_policy (
     CORBA::PolicyType type,
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index bacc2ea9889..34bfff09e1b 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -17,10 +17,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PI,
-           PolicyFactory_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PolicyFactory_Registry_Adapter*
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 00fc855faec..56c04f34765 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -1,16 +1,11 @@
+// $Id$
+
 #include "tao/PI/PolicyFactory_Registry.h"
 #include "tao/PI/PolicyFactoryC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PolicyC.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (PI,
-           PolicyFactory_Registry,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 0a5627af836..26e2a60a021 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -10,10 +10,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RCSID (tao,
-           ProcessingModePolicy,
-           "$Id$")
-
 // Should this all be wrapped in #if (TAO_HAS_MINIMUM_POA == 0)?
 
 TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 2388515e963..91dfc168581 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "tao/PI/RequestInfo_Util.h"
@@ -13,10 +12,6 @@
 #include "tao/SystemException.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           RequestInfo_Util,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
index 7e5df08de77..625924a6506 100644
--- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
@@ -20,10 +20,6 @@
 #include "tao/PI/PICurrent.h"
 #include "tao/PI/PICurrent_Impl.h"
 
-ACE_RCSID (tao,
-           TAO_RequestInterceptorAdapter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void)
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index fd5fb2862b9..af46cf21f0e 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/PICurrent_Guard.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-
-ACE_RCSID (PortableServer,
-           PICurrent_Guard,
-           "$Id$")
-
-
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/PI/PICurrent.h"
diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp
index 357d1cfee66..e17c2c8fad2 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -1,11 +1,10 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/PI_Server/PI_Server_Loader.h"
 #include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
 
-ACE_RCSID (PI_Server,
-           PI_Server,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index fbbc70400ab..11f62ea0fc0 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -1,4 +1,4 @@
-
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/PI_Server_Loader.h"
@@ -8,10 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (PI_Server,
-           PI_Server_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PI_Server_Loader::TAO_PI_Server_Loader (void)
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 827ac975c0d..4e043d47252 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PI_Server/PortableServer_ORBInitializer.h"
 #include "tao/PI_Server/PortableServer_PolicyFactory.h"
@@ -8,11 +9,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PI_Server,
-           PortableServer_ORBInitializer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index e2a8d8665f9..462a5749cb7 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -1,6 +1,7 @@
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PI_Server/PortableServer_PolicyFactory.h"
-
 #include "tao/PortableServer/ThreadPolicy.h"
 #include "tao/PortableServer/LifespanPolicy.h"
 #include "tao/PortableServer/IdAssignmentPolicy.h"
@@ -11,10 +12,6 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PI_Server/Policy_Creator_T.h"
 
-ACE_RCSID (PI_Server,
-           PortableServer_PolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 3a3da8b5430..e4782a7d1ec 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/ServerInterceptorAdapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (PI_Server,
-           ServerInterceptorAdapter,
-           "$Id$")
-
 #include "tao/PI_Server/ServerRequestInfo.h"
 #include "tao/PI_Server/PICurrent_Guard.h"
 
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index 2c7fcb81774..a5934d27df9 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/ServerRequestDetails.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8,10 +11,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID (PI_Server,
-           ServerRequestDetails,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index a63e7864817..b2dfbab6edb 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/ServerRequestInfo.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-ACE_RCSID (PI_Server,
-           ServerRequestInfo,
-           "$Id$")
-
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Servant_Upcall.h"
 #include "tao/PortableServer/Servant_Base.h"
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
index 958da850a84..7575ee39bca 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
@@ -20,11 +20,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PI_Server,
-           PolicyFactory_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ServerRequestInterceptor_Adapter*
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index 40fbcb5eebc..e6e8a28c993 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -7,10 +7,6 @@
 #include "tao/Pluggable_Messaging_Utils.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Pluggable_Messaging_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t)
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
index c33f3a2710e..a34d165dc31 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,13 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PolicyFactory_Registry_Adapter.h"
 
-
-ACE_RCSID (tao,
-           PolicyFactory_Registry_Adapter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp
index 76a51641ae7..155f82be0db 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PolicyFactory_Registry_Factory.h"
 
-ACE_RCSID (tao,
-           PolicyFactory_Registry_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void)
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index 6015144dd5a..ba90e53baa4 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -10,11 +10,6 @@
 # include "tao/Policy_Current.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Policy_Current,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Policy_Current_Impl &
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index bf40e768f2e..353f5000946 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -8,11 +8,6 @@
 # include "tao/Policy_Manager.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           Policy_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::PolicyList *
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index afbc6ae3489..b4e23df379b 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Policy_Set.h"
@@ -9,10 +10,6 @@
 # include "tao/Policy_Set.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Policy_Set,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index 660f63644a4..bc8fa0df437 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -2,14 +2,8 @@
 
 #include "tao/Policy_Validator.h"
 #include "tao/debug.h"
-
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tao,
-           Policy_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index ea683b1130a..b89a7dce30e 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -1,12 +1,9 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Acceptor_Filter_Factory.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 
-ACE_RCSID(PortableServer,
-          Acceptor_Filter_Factory,
-          "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 84b87ea4dd7..396459a94d7 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -14,10 +14,6 @@
 #include "tao/debug.h"
 #include "PortableServer_Functions.h"
 
-ACE_RCSID(PortableServer,
-          Active_Object_Map,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /* static */
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 8c622b4eaea..61041390c8b 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PortableServer/Active_Object_Map_Entry.h"
 
-ACE_RCSID(PortableServer,
-          Active_Object_Map_Entry,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index c1981048df9..ce322b8f0e8 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Active_Policy_Strategies.h"
@@ -33,11 +34,6 @@
 # include "tao/PortableServer/Active_Policy_Strategies.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(PortableServer,
-          Active_Policy_Strategies,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
index c05446d7a14..654e18b408c 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Adapter_Activator.h"
 
-ACE_RCSID (PortableServer,
-           Adapter_Activator,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
index 204b5d9868c..2c36b1863ad 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -1,12 +1,8 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Collocated_Arguments_Converter.h"
 
-ACE_RCSID(PortableServer,
-          TAO_Collocated_Arguments_Converter,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index bc946d33eb9..c045934fa59 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -1,20 +1,13 @@
 //$Id$
-// -- PortableServer Include --
+
 #include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Servant_Upcall.h"
 #include "tao/PortableServer/Servant_Base.h"
-
-
-// -- TAO Include --
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
 
-ACE_RCSID (PortableServer,
-           Collocated_Object_Proxy_Broker,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
index 0156db0dec3..e9ee2dade56 100644
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -1,8 +1,6 @@
-#include "tao/PortableServer/Creation_Time.h"
+// $Id$
 
-ACE_RCSID (PortableServer,
-           Creation_Time,
-           "$Id$")
+#include "tao/PortableServer/Creation_Time.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Creation_Time.inl"
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 40177f90b27..a8786cbabaf 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,15 +1,11 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 
-ACE_RCSID(PortableServer,
-          Default_Acceptor_Filter,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index e66ba77840b..8e19fb20bcb 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -6,11 +6,6 @@
 #include "tao/PolicyFactory_Registry_Adapter.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID (PortableServer,
-           Default_Policy_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator (
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 284fb7e1dd9..20b16a3dbc5 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -3,11 +3,6 @@
 #include "tao/PortableServer/Default_Servant_Dispatcher.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Network_Priority_Hook.h"
-
-ACE_RCSID(PortableServer,
-          Default_Servant_Dispatcher,
-          "$Id$")
-
 #include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 184c4c28692..fea4bc90175 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
@@ -11,10 +12,6 @@
 #include "tao/Object.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (PortableServer,
-           Direct_Collocation_Upcall_Wrapper,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 5e5c697efe6..c564ce60c39 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,10 +1,8 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/IdAssignmentPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           IdAssignmentPolicy,
-           "$Id$")
-
 #include "ace/CORBA_macros.h"
 
 #if !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index eb32db2161c..504f311821d 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -2,11 +2,6 @@
 
 #include "tao/PortableServer/IdAssignmentStrategy.h"
 
-ACE_RCSID (PortableServer,
-           IdAssignmentStrategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 1a82a4df0e4..64125e36789 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -4,10 +4,6 @@
 #include "tao/PortableServer/IdAssignmentStrategy.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (PortableServer,
-           IdAssignmentStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index 11a9474effe..79dbb0f6e21 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,12 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/IdAssignmentStrategySystem.h"
 
-ACE_RCSID (PortableServer,
-           Id_Assignment_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index f97260dc1b8..e30a3b897fe 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PortableServer/IdAssignmentStrategyUser.h"
 
-ACE_RCSID (PortableServer,
-           Id_Assignment_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index f0096d44855..d4e8360b914 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,10 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/IdUniquenessPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID (PortableServer,
-           IdUniquenessPolicy,
-           "$Id$")
-
 #include "ace/CORBA_macros.h"
 
 #if !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index ade09c36cd2..550b416663b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -4,10 +4,6 @@
 #include "tao/PortableServer/IdUniquenessStrategy.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (PortableServer,
-           IdUniquenessStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index d1e3920d8f9..338f133ab6a 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,12 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
 
-ACE_RCSID (PortableServer,
-           Id_Uniqueness_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index f528cada72a..ef86863e04d 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -3,11 +3,6 @@
 #include "tao/PortableServer/IdUniquenessStrategyUnique.h"
 #include "tao/PortableServer/Root_POA.h"
 
-ACE_RCSID (PortableServer,
-           Id_Uniqueness_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index 3bb16166c08..cf426d70b8b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -4,10 +4,6 @@
 #include "tao/PortableServer/IdUniquenessStrategyUnique.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (PortableServer,
-           IdUniquenessStrategyUniqueFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
index c5a9d148f85..310cf51b8db 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PortableServer/ImR_Client_Adapter.h"
 
-ACE_RCSID (tao,
-           ImR_Client_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 6d3a91be8fb..139dd439472 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,10 +1,7 @@
+// $Id$
+
 #include "tao/PortableServer/ImplicitActivationPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationPolicy,
-           "$Id$")
-
 #include "ace/CORBA_macros.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index ad404a21c14..4f825caab71 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategy.h"
 
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 30ae08a7469..29455fc7a9f 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
 
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyExplicit,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -20,8 +17,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ImplicitActivationStrategyExplicit,
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 9b113b1fafc..9a41f2b1915 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
@@ -5,10 +6,6 @@
 #include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
 #include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
 
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index 81878c8b94a..e50ad89be99 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,11 +1,7 @@
-// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
 
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyImplicit,
-           "$Id$")
-
 #if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index bd9fae695d4..4d59ff4b642 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Key_Adapters.h"
@@ -6,12 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Map_T.h"
 
-ACE_RCSID (PortableServer,
-           Key_Adapters,
-           "$Id$")
-
-///////////////////////////////////////////////////////////////////////////////
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index d478bece27d..87a41ea8abb 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -1,10 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/LifespanPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID (PortableServer,
-           LifespanPolicy,
-           "$Id$")
-
 #include "ace/CORBA_macros.h"
 
 #if !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
index 46ae7a9c870..976845cad88 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -11,10 +11,6 @@
 
 #include "tao/PortableServer/LifespanStrategy.h"
 
-ACE_RCSID (PortableServer,
-           LifespanStrategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 700cd5b6527..e859a50587f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -4,10 +4,6 @@
 #include "tao/PortableServer/LifespanStrategy.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 8f16ff49b3a..7d8eb1d7cb2 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,11 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/LifespanStrategyPersistent.h"
-
-ACE_RCSID (PortableServer,
-           Lifespan_Strategy,
-           "$Id$")
-
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POAManager.h"
 #include "tao/PortableServer/ImR_Client_Adapter.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 2e25ce5ae9e..349374e809f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/PortableServer/LifespanStrategyPersistent.h"
 
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index dd2fd1b5dfb..eec9ca12ce0 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,11 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/LifespanStrategyTransient.h"
-
-ACE_RCSID (PortableServer,
-           Lifespan_Strategy,
-           "$Id$")
-
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_string.h"
 #include "tao/PortableServer/POAManager.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index ae8085a17bd..d51455af87d 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/PortableServer/LifespanStrategyTransient.h"
 
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
index 7ce7d293988..f63bb146c87 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp
@@ -3,10 +3,6 @@
 #include "tao/PortableServer/Local_Servant_Base.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (PortableServer,
-           Local_Servant_Base,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Local_Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
index 6febf421bb4..b1965c31be2 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -1,13 +1,9 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/PortableServer/Network_Priority_Hook.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POA_Cached_Policies.h"
 
-ACE_RCSID(PortableServer,
-          Network_Priority_Hook,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void)
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index 6c3a108831f..1702524039e 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -8,10 +8,6 @@
 # include "tao/PortableServer/Non_Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer,
-           Non_Servant_Upcall,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index 7d4a85297b8..99d72a4ee81 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PortableServer/ORT_Adapter_Factory.h"
 
-ACE_RCSID (PortableServer,
-           ORT_Adapter_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index ee487547996..7e487f8bd2c 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -48,10 +48,6 @@
 #include "tao/PortableServer/RequestProcessingPolicy.h"
 #include "tao/PortableServer/ServantRetentionPolicy.h"
 
-ACE_RCSID (PortableServer,
-           Object_Adapter,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 namespace PortableServer
 {
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index bf8be18d80d..13e7de29186 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,15 +1,11 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/ORB.h"
 
-ACE_RCSID(PortableServer,
-          Operation_Table,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// destructor
 TAO_Operation_Table::~TAO_Operation_Table (void)
 {
 }
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index 0df9e27630a..29e37c7bda2 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Operation_Table_Binary_Search.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(PortableServer,
-          Operation_Table_Binary_Search,
-          "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Operation_Table_Timeprobe_Description[] =
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index 21a206d9fba..eae26a71e4e 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -4,10 +4,6 @@
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(PortableServer,
-          Operation_Table_Dynamic_Hash,
-          "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Operation_Table_Timeprobe_Description[] =
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 0ad27a2c2c8..95739497b67 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -4,10 +4,6 @@
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(PortableServer,
-          Operation_Table_Linear_Searc,
-          "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Operation_Table_Timeprobe_Description[] =
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 25e30a1999e..da100f9802e 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -4,10 +4,6 @@
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(PortableServer,
-          Operation_Table_Perfect_Hash,
-          "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Operation_Table_Timeprobe_Description[] =
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 8cbd7aa4ccf..b1525a38043 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -12,10 +12,6 @@
 # include "tao/PortableServer/POAManager.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer,
-           POAManager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_Manager::TAO_POA_Manager (
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index 2c0fc32b1da..d4e04746ab1 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/POAManagerFactory.h"
@@ -6,10 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (PortableServer,
-           POAManagerFactory,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index d531f09197f..9c2c871978c 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -14,10 +14,6 @@
 # include "tao/PortableServer/POA_Cached_Policies.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(PortableServer,
-          POA_Cached_Policies,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index defd9558ce1..34712dbbae5 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // -- PortableServer Include --
@@ -7,10 +8,6 @@
 // -- TAO Include --
 #include "tao/TSS_Resources.h"
 
-ACE_RCSID (PortableServer,
-           POA_Current,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index 87c214651a5..03ba7d7efa2 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -11,10 +11,6 @@
 # include "tao/PortableServer/POA_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer,
-           POA_Current_IMpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index 17b976b6244..48137972315 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -4,11 +4,6 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID(PortableServer,
-          POA_Guard,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index 2757259f5d8..99e8bc75c66 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -43,7 +43,9 @@ namespace TAO
       POA_Guard (::TAO_Root_POA &poa, bool check_for_destruction = true);
 
     private:
+// FUZZ: disable check_for_ACE_Guard
       ACE_Guard<ACE_Lock> guard_;
+// FUZZ: enable check_for_ACE_Guard
     };
   } /* namespace Portable_Server */
 } /* namespace TAO */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index d4bc8d261bd..03bff4ef0f1 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/PortableServer/POA_Policy_Set.h"
 #include "tao/PortableServer/POA_Cached_Policies.h"
@@ -11,10 +11,6 @@
 # include "tao/PortableServer/POA_Policy_Set.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer,
-           POA_Policy_Set,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_Policy_Set::TAO_POA_Policy_Set (void)
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index a5004ba3230..00f1d8f6d04 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -42,11 +42,6 @@
 #include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
 #include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
 
-ACE_RCSID (PortableServer,
-           PortableServer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
index ac70be706c3..1d3ca4f2678 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,9 +1,7 @@
-#include "tao/PortableServer/PortableServer_Functions.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer_Functions,
-           "$Id$")
+// -*- C++ -*-
+// $Id$
 
+#include "tao/PortableServer/PortableServer_Functions.h"
 #include "ace/OS_NS_string.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
index d980f303b74..a8dcae59c7e 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,8 +1,6 @@
-#include "tao/PortableServer/PortableServer_WFunctions.h"
+// $Id$
 
-ACE_RCSID (PortableServer,
-           PortableServer_WFunctions,
-           "$Id$")
+#include "tao/PortableServer/PortableServer_WFunctions.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index ccee777e6a8..b9dc40d458a 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -1,8 +1,6 @@
-#include "tao/PortableServer/Regular_POA.h"
+// $Id$
 
-ACE_RCSID (PortableServer,
-           POA,
-           "$Id$")
+#include "tao/PortableServer/Regular_POA.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Regular_POA.inl"
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 3a1f478abc6..033ac4356c2 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,8 +1,7 @@
-#include "tao/orbconf.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID (PortableServer,
-           RequestProcessingPolicy,
-           "$Id$")
+#include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 237449a1938..7e6e3ecb2fb 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -10,11 +10,6 @@
 
 #include "tao/PortableServer/RequestProcessingStrategy.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 4778aa7db48..b42e3f30173 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
@@ -7,10 +8,6 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Root_POA.h"
 
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index bd1dbfcd0f4..75be8246496 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
@@ -6,10 +7,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyAOMOnlyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index f773734e11b..331fa1eb987 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 2d35f836d8f..42f778c5e21 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyDefaultServantFI,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 7b099039acd..dbaadb81a5d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -8,10 +8,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 2729e7c0cc6..a9ba9d5033b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 4afafb884be..89ade874fbc 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyServantActivatorFactoryImpl,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index f51ac0a48e4..c8bc26f2890 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,9 +1,5 @@
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index e71553ede87..f2b2c9bc23d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyServantLocatorFactoryImpl,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 2be69725f9b..2a7241cb207 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index c852a439880..48689b2c43e 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -61,10 +61,6 @@
 # include "tao/PortableServer/Root_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer,
-           Root_POA,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index 5daea4a5819..fcf4cd21f7e 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,10 +1,7 @@
+// $Id$
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           ServantRetentionPolicy,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/ServantRetentionPolicy.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index be704740000..e203b22a0fa 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
@@ -6,10 +7,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 08238836769..d797edb925e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -17,10 +17,6 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyNonRetain,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index 2fbf8cc8de9..e9284dd771b 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyNonRetainFactoryImpl,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 342e6c29689..ae04c2ae17c 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -23,10 +23,6 @@
 #include "ace/Monitor_Size.h"
 #endif /* TAO_HAS_MONITOR_POINTS */
 
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyRetain,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index 18048bd07d2..a453de132ef 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
@@ -6,10 +7,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyRetainFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index feca70b4c51..96e284963ef 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Servant_Base.h"
@@ -17,10 +18,6 @@
 
 //@@ TAO_SERVANT_BASE_INCLUDE_ADD_HOOK
 
-ACE_RCSID (PortableServer,
-           Servant_Base,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index 05f34b15345..d61fb7e36a7 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,12 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Servant_Dispatcher.h"
 
-ACE_RCSID(PortableServer,
-          Servant_Dispatcher,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void)
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index b3c62852440..0e6b76a9ace 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -19,10 +19,6 @@
 
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (PortableServer,
-           Servant_Upcall,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index 58a4bc04c11..e6277bf7292 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -1,12 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/StrategyFactory.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (PortableServer,
-           StrategyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index 57b630bc0f3..a2174748b65 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,8 +1,7 @@
-#include "tao/orbconf.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID (PortableServer,
-           ThreadPolicy,
-           "$Id$")
+#include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 900d238a905..085784f481a 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/PortableServer/ThreadStrategy.h"
 
-ACE_RCSID (PortableServer,
-           ThreadStrategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index 4667bf58395..b9fe653988b 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -5,10 +5,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ThreadStrategyFactoryImpl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index e5c2e6b47a9..4b638689160 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,12 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ThreadStrategyORBControl.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ThreadStrategyORBControl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 166aaf1cec4..040a2ad69d9 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           ThreadStrategySingle,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/ThreadStrategySingle.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index bcccac2035f..8967b90a273 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/orbconf.h"
 
-ACE_RCSID (PortableServer,
-           ThreadStrategyFactoryImpl,
-           "$Id$")
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 #include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index f45184d950e..050d1853f5e 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -2,11 +2,6 @@
 
 #include "tao/PortableServer/Upcall_Command.h"
 
-ACE_RCSID (PortableServer,
-           Upcall_Command,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Upcall_Command::~Upcall_Command (void)
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index cdf37af7b09..f3dad5e121c 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -20,10 +20,6 @@
 #include "ace/Log_Msg.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PortableServer,
-           Upcall_Wrapper,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 7edcce46ee9..3d5b7d38d34 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -20,13 +20,6 @@
 #include "tao/Profile.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           Profile,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Profile::TAO_Profile (CORBA::ULong tag,
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index e72f2563a8f..8b3b879ccf1 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Protocol_Factory.h"
 
-ACE_RCSID (tao,
-           Protocol_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag)
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index 884c613ea41..257588d025c 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -3,10 +3,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao,
-           Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index a6c50dcc910..8d84d34d8f1 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/QtReactor/QtReactor.h"
 
-ACE_RCSID (TAO_QtResource,
-           QtResource_Factory,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index c63dd54e4dc..a42e670a821 100644
--- a/TAO/tao/QtResource/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -1,12 +1,9 @@
 //$Id$
+
 #include "tao/QtResource/QtResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/QtResource/QtResource_Factory.h"
 
-ACE_RCSID( TAO_QtResource,
-           QtResource_Loader,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index 64b5210401e..32b929cdb8f 100644
--- a/TAO/tao/Queued_Data.cpp
+++ b/TAO/tao/Queued_Data.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Queued_Data.h"
 #include "tao/debug.h"
 
@@ -8,10 +11,6 @@
 # include "tao/Queued_Data.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Queued_Data,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /*!
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index 1f83185fa98..ce559374f08 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -6,10 +6,6 @@
 # include "tao/Queued_Message.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Queued_Message,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc,
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 4d9cf34cc84..517747bee39 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -6,8 +6,6 @@
 
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index c57b9a85397..7b2b722bcb5 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -7,10 +7,6 @@
 #include "tao/RTCORBA/Direct_Priority_Mapping.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA,
-          Direct_Priority_Mapping,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 0f56c3838c2..45bacc3d3f2 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/orbconf.h"
@@ -11,10 +10,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RTCORBA,
-           Linear_Network_Priority_Mapping,
-           "$Id$")
-
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 #define IPDSFIELD_DSCP_CS1      0x08
 #define IPDSFIELD_DSCP_CS2      0x10
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index c400b5677ad..6ddfc80ec2b 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -9,11 +9,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RTCORBA,
-           Linear_Priority_Mapping,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index f2ccd5b42bb..3c46176ee91 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -9,10 +9,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID (RTCORBA,
-           Multi_Priority_Mapping,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index b896b6c61d2..f56d6466603 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -4,10 +4,6 @@
 
 #include "tao/RTCORBA/Network_Priority_Mapping.h"
 
-ACE_RCSID(RTCORBA,
-          Network_Priority_Mapping,
-          "$Id$")
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
index 682f18f3ec9..96bbdfa763a 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           Network_Priority_Mapping_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager (
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index ae4f6ebcf3f..2405f987196 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -6,10 +6,6 @@
 
 #include "tao/RTCORBA/Priority_Mapping.h"
 
-ACE_RCSID(RTCORBA,
-          Priority_Mapping,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 60c1aab2796..93ad7929f60 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           Priority_Mapping_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 3f29493da22..479959a4c2b 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -6,8 +6,6 @@
 
 #include "tao/RTCORBA/RT_ORB_Loader.h"
 
-ACE_RCSID (RTCORBA, RTCORBA, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index c742d79fc3f..c2b4652406b 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "tao/RTCORBA/RT_Current.h"
 
@@ -15,10 +13,6 @@
 
 #include "ace/Thread.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Current,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index dea1f603248..49bb29b57e2 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -10,14 +12,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Selector_Factory,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 611a7cc3ea7..aefc780495f 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Endpoint_Utils.h"
 #include "tao/Profile_Transport_Resolver.h"
 
@@ -10,12 +12,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Utils,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 2225739355d..b45f07889b3 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -19,10 +21,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Invocation_Endpoint_Selectors,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index d0c7b4c22ff..85bbfc70d10 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -7,10 +7,6 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(RTCORBA,
-          RT_Mutex,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Mutex::~TAO_RT_Mutex (void)
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 625035b99b5..d590397f068 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -14,10 +14,6 @@
 #include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA,
-          RT_ORB,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 6d70c55f9b2..0fb917121dc 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_ORBInitializer.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_ORBInitializer,
-           "$Id$")
-
-
 #define TAO_RTCORBA_SAFE_INCLUDE
 #include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index d9c0abbc250..2b6012e33be 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_ORB_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -11,10 +13,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Arg_Shifter.h"
 
-ACE_RCSID (RTCORBA,
-           RT_ORB_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 9539b13cf22..28649a37e37 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_PolicyFactory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_PolicyFactory,
-           "$Id$")
-
 #include "tao/RTCORBA/RT_Policy_i.h"
-
 #include "tao/PolicyC.h"
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 6da88e48a9c..df708a40ba4 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -13,12 +13,6 @@
 
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Policy_i,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 5f66cc836d3..8d5e4119720 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Protocols_Hooks.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -24,10 +26,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
diff --git a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
index d6cc3e03b57..84df66adb71 100644
--- a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
+++ b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/RTCORBA/RT_Service_Context_Handler.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Service_Context_Handler,
-           "$Id$")
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/RTCORBA/RT_Policy_i.h"
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 0a2a694a416..772d5d0dba4 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -10,11 +10,6 @@
 #include "tao/Policy_Manager.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Stub,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 9cd059f682d..ddcb74c4169 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -10,12 +10,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (RTCORBA,
-           RT_TAO_Stub_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index c2798081cab..c0c408ccfd8 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_Thread_Lane_Resources_Manager,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/Acceptor_Registry.h"
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index 886314dd2f0..a71f3540b27 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -7,8 +7,6 @@
 #include "tao/RTCORBA/RT_Transport_Descriptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$")
-
 #include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
 #include "tao/Endpoint.h"
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index 020fe70267a..7b592e0a1f7 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           TAO_RT_Transport_Descriptor_Property,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 79bfe3a8028..248fc203aa4 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/RTCORBA/Thread_Pool.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           Thread_Pool,
-           "$Id$")
-
 #if ! defined (__ACE_INLINE__)
 #include "tao/RTCORBA/Thread_Pool.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index 0a1a167af7a..b8851a79c71 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -14,16 +14,13 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTPortableServer, 
-           RTPortableServer, 
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index c746b30a1e3..dd1684d77a3 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -8,11 +8,6 @@
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Acceptor_Filter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter (
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 2757f4bdbca..f13f5769020 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID(RTPortableServer,
-          RT_Collocation_Resolver,
-          "$Id$")
-
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/Object.h"
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index c501056af06..7117827b810 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -10,11 +10,6 @@
 #include "tao/RTPortableServer/RT_Policy_Validator.h"
 #include "tao/RTPortableServer/RT_Collocation_Resolver.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Object_Adapter_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter*
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index ab2898b9111..73162b0032b 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -30,10 +30,6 @@
 # include "tao/RTPortableServer/RT_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (RTPortableServer,
-           RT_POA,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 8c0d5dde7ac..a5345dc9426 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/RTPortableServer/RT_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -14,11 +17,6 @@
 #include "tao/Policy_Set.h"
 #include "tao/Transport_Acceptor.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Policy_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 06a9054a1f9..49d2f50c077 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+// $Id$
 
 #include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
 
@@ -22,11 +24,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Servant_Dispatcher,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index dff0f807e5a..1853c2e62d7 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/RTScheduling/Current.h"
 #include "tao/RTScheduling/Distributable_Thread.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
@@ -8,11 +11,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (RTScheduling,
-           Current,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp
index 15eebbb61fe..27b5382c077 100644
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler.cpp
@@ -3,8 +3,6 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "tao/RTScheduling/RTScheduler_Loader.h"
 
-ACE_RCSID (RTScheduler, RTScheduler, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void)
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index 561faff2d0b..79d870c7042 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Initializer.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
-ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
-
 #include "tao/RTScheduling/RTScheduler.h"
 #include "tao/RTScheduling/Current.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 853674ac95a..c4d3092bdec 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Loader.h"
@@ -8,9 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (TAO, RTScheduler_Loader, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
index 773ab9cdc02..624ac7fc27a 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Manager.h"
@@ -6,8 +7,6 @@
 #include "tao/RTScheduling/RTScheduler_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(TAO, RT_ORB, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 0d3a2e8f6f3..f33bd1a2241 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -12,10 +12,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTScheduling,
-           Request_Interceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const IOP::ServiceId
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index fec22b526d0..2b8e814914c 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Reactive_Connect_Strategy.h"
 #include "tao/Connection_Handler.h"
 #include "tao/ORB_Core.h"
@@ -7,11 +10,6 @@
 
 #include "ace/Synch_Options.h"
 
-ACE_RCSID(tao,
-          Reactive_Connect_Strategy,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy (
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 4d0e7ff8078..9f1ba2e5817 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -6,11 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Queued_Message.h"
 
-ACE_RCSID (tao,
-           Reactive_Flushing_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
index 074a9e3d6ed..821ec89af36 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Refcounted_ObjectKey.h"
 #include "ace/Log_Msg.h"
 
@@ -6,11 +8,6 @@
 #include "tao/Refcounted_ObjectKey.inl"
 #endif /* defined INLINE */
 
-ACE_RCSID(tao,
-          Refcounted_ObjectKey,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key)
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index 4214cc510a2..38b1346fc52 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -12,10 +12,6 @@
 #include "tao/debug.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (tao,
-           Remote_Invocation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -114,12 +110,12 @@ namespace TAO
 
   void
   Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream)
-    {
-      // Marshal application data
-      if (this->details_.marshal_args (out_stream) == false)
-        {
-          throw ::CORBA::MARSHAL ();
-        }
+  {
+    // Marshal application data
+    if (this->details_.marshal_args (out_stream) == false)
+      {
+        throw ::CORBA::MARSHAL ();
+      }
   }
 
   Invocation_Status
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index e1a48b7f411..8dbf58e2a23 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Remote_Object_Proxy_Broker.h"
 #include "tao/CORBA_String.h"
 #include "tao/UB_String_Arguments.h"
@@ -9,11 +12,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao,
-           Remote_Object_Proxy_Broker,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index e69fec458e2..700d3f5c8e7 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Reply_Dispatcher.h"
 
-ACE_RCSID (tao,
-           Reply_Dispatcher,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/RequestInterceptor_Adapter.cpp b/TAO/tao/RequestInterceptor_Adapter.cpp
index c0657ad21cd..c5d14708881 100644
--- a/TAO/tao/RequestInterceptor_Adapter.cpp
+++ b/TAO/tao/RequestInterceptor_Adapter.cpp
@@ -13,10 +13,6 @@
 
 #include "tao/RequestInterceptor_Adapter.h"
 
-ACE_RCSID (tao,
-           RequestInterceptor_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter (void)
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index dd44d1338f9..eed80b6d415 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -4,10 +4,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao,
-           Request_Dispatcher,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index 8ecee46a4c4..a7a8f63d612 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -3,16 +3,8 @@
 #include "tao/Resource_Factory.h"
 #include "tao/Protocol_Factory.h"
 #include "tao/orbconf.h"
-
 #include "ace/ACE.h"
 
-ACE_RCSID (tao,
-           Resource_Factory,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 6ce7297a70f..28fd66a49e1 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Resume_Handle.h"
 #include "tao/ORB_Core.h"
 #include "debug.h"
@@ -8,11 +11,6 @@
 # include "tao/Resume_Handle.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Resume_Handle,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
index 7afe711cb85..b681460417c 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -1,8 +1,6 @@
-#include "tao/ServerRequestInterceptor_Adapter.h"
+// $Id$
 
-ACE_RCSID (tao,
-           ServerRequestInterceptorAdapter,
-           "$Id$")
+#include "tao/ServerRequestInterceptor_Adapter.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index 3408f8b97aa..6bc92e719ff 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -1,9 +1,7 @@
-#include "tao/ServerRequestInterceptor_Adapter_Factory.h"
-
-ACE_RCSID (tao,
-           ServerRequestInterceptorAdapterFactory,
-           "$Id$")
+// -*- C++ -*-
+// $Id$
 
+#include "tao/ServerRequestInterceptor_Adapter_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 7b8c1f300c4..079b96605db 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -3,11 +3,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/orbconf.h"
 
-ACE_RCSID (tao, 
-           Server_Strategy_Factory, 
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 30546a5b5ac..a299d79d1be 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "tao/Service_Callbacks.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 #include "tao/Invocation_Utils.h"
 
-ACE_RCSID (tao,
-           Service_Callbacks,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index c1582970bd9..c461714e4c3 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Service_Context.h"
@@ -9,11 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           Service_Context,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Service_Context_Handler_Registry.cpp b/TAO/tao/Service_Context_Handler_Registry.cpp
index 8323b56f41d..d660863596f 100644
--- a/TAO/tao/Service_Context_Handler_Registry.cpp
+++ b/TAO/tao/Service_Context_Handler_Registry.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/Service_Context_Handler_Registry.h"
-
-ACE_RCSID (tao,
-           Service_Context_Handler_Registry,
-           "$Id$")
-
 #include "tao/TAO_Server_Request.h"
 #include "tao/Service_Context_Handler.h"
 
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index af6f5edb1fa..0d3c65def83 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/SmartProxies/Smart_Proxies.h"
 
-ACE_RCSID(SmartProxies,
-          Smart_Proxies,
-          "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "tao/SmartProxies/Smart_Proxies.inl"
 #endif /* defined INLINE */
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index cc80b67b038..81e341e6504 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -16,10 +16,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
index 10f0fdfdf9e..e14bd8e9794 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -19,9 +19,6 @@
 #include "tao/Strategies/COIOP_Transport.h"
 #include "tao/Strategies/COIOP_Endpoint.h"
 
-ACE_RCSID(tao, COIOP_Connect, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index d73aaa6544f..25ddaccc61c 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -11,15 +11,8 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
-
 #include "tao/Strategies/COIOP_Profile.h"
 
-
-ACE_RCSID (Strategies,
-           COIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Connector::TAO_COIOP_Connector (void)
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 9f383b98a8d..103c924601e 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -1,7 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "tao/Strategies/COIOP_Endpoint.h"
 
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
@@ -13,11 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/COIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp
index 3edd438776a..6e2dfa0d3b7 100644
--- a/TAO/tao/Strategies/COIOP_Factory.cpp
+++ b/TAO/tao/Strategies/COIOP_Factory.cpp
@@ -11,10 +11,6 @@
 
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "COIOP";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index 085a908f5a6..ece1da6e39c 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -14,10 +14,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "niop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 98558936eb5..650c8da71bb 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -19,8 +19,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (tao, COIOP_Transport, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 1756e7f01b3..fbcd50fe5df 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -22,10 +22,6 @@
 
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 193d4521af6..6421ec82b35 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -22,9 +22,6 @@
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(tao, DIOP_Connect, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index ed6c16ceb6c..612cbe8da62 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -19,12 +19,6 @@
 
 #include "tao/Strategies/DIOP_Profile.h"
 
-
-ACE_RCSID (Strategies,
-           DIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Connector::TAO_DIOP_Connector (void)
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index ace8929ad97..f72a0d6f009 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -1,7 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "tao/Strategies/DIOP_Endpoint.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
@@ -13,12 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Strategies,
-           DIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/DIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index 53722ace578..40b455412ac 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -11,10 +11,6 @@
 
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 4f610cd4b54..b8b69911bab 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 2af168556aa..8a4d8df144c 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -19,8 +19,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (tao, DIOP_Transport, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index c973cee3a80..02ec7c280ef 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -3,9 +3,6 @@
 #include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index c254f148637..5409467f09f 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -3,9 +3,6 @@
 #include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index 67c5f5e0871..70c76057700 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -6,9 +6,6 @@
 # include "tao/Strategies/LF_Strategy_Null.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, LF_Strategy_Null, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 4c49b8ee312..dc293a22271 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -3,8 +3,6 @@
 #include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index 69b63f857bf..213c16a1c33 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -9,10 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS.h"
 
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_OC_Endpoint_Selector_Factory::TAO_OC_Endpoint_Selector_Factory (void)
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index 314ec97354b..d72d7840658 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -13,10 +13,6 @@
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
 #include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
 
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index de79c013571..d2ddba7e29c 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
 
@@ -12,10 +13,6 @@
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (tao,
-           Optimized_Connection_Endpoint_Selector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index b30ebd33316..9d3b6ea28ed 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Acceptor.h"
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -15,10 +17,6 @@
 #include "tao/Strategies/SCIOP_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao,
-          SCIOP_Acceptor,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index c81e4783c9d..c79fc982932 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Connection_Handler.h"
 
 #if TAO_HAS_SCIOP == 1
@@ -29,10 +31,6 @@
 #include "tao/Wait_Strategy.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (tao,
-           SCIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 0d37ec2c6a9..96bb86eb44c 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Connector.h"
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -19,12 +21,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Strategies_T.h"
 
-
-ACE_RCSID (TAO,
-           SCIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Connector::TAO_SCIOP_Connector (void)
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 6bf21e7fcff..46767e9c585 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -14,11 +14,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Strategies,
-           SCIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/SCIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index a80c8f7e0b3..5976cefa1ca 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Factory.h"
 #include "tao/Strategies/SCIOP_Acceptor.h"
 #include "tao/Strategies/SCIOP_Connector.h"
@@ -7,10 +9,6 @@
 
 #include "tao/IOPC.h"
 
-ACE_RCSID (tao,
-           SCIOP_Factory,
-           "$Id$")
-
 static const char prefix_[] = "sciop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 8795dcf8570..084a99c0a22 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -1,5 +1,5 @@
 // This may look like C, but it's really -*- C++ -*-
-// SCIOP_Profile.cpp
+// $Id$
 
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -14,10 +14,6 @@
 #include "tao/Strategies/sciop_endpointsC.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Strategies,
-          SCIOP_Profile,
-          "$Id$")
-
 static const char prefix_[] = "sciop";
 
 const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index 777c8e08b3c..b58775f64ba 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -21,10 +21,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Adapter.h"
 
-ACE_RCSID (tao,
-           SCIOP_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 6a117d233a3..2110f8551d0 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -15,10 +15,6 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 2f5a6b4c0d6..51ea5dd0095 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -20,10 +20,6 @@
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index aa4a0e7acd8..74c4396e1c1 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "tao/Strategies/SHMIOP_Connector.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -17,10 +16,6 @@
 #include "tao/Blocked_Connect_Strategy.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void)
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index 3304db3ecf6..2e7fbb565db 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -10,12 +10,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-
-ACE_RCSID (Strategies,
-           SHMIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/SHMIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index 959e03d9bac..a1d055cf22b 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SHMIOP_Factory.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -11,12 +13,6 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (Strategies,
-           SHMIOP_Factory,
-           "$Id$")
-
-
 static const char prefix_[] = "shmiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 11460b69f09..23f7c52818e 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SHMIOP_Profile.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -12,11 +14,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Profile,
-           "$Id$")
-
 #include "ace/os_include/os_netdb.h"
 
 static const char prefix_[] = "shmiop";
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index c7bcf6ba2f7..ae41d111420 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -16,9 +16,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
index 6aa63c6b810..05913f2a6ac 100644
--- a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
+++ b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
@@ -1,9 +1,6 @@
-#include "tao/Strategies/Strategies_ORBInitializer.h"
-
-ACE_RCSID (Strategies,
-           Strategies_ORBInitializer,
-           "$Id$")
+// $Id$
 
+#include "tao/Strategies/Strategies_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 96c87fbea5c..b6c0aecd997 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Acceptor.h"
 
 #if TAO_HAS_UIOP == 1
@@ -15,10 +17,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index a52abb6c64b..2b46582703c 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -18,10 +18,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Protocols_Hooks.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 23e2520efc9..232b53f2d38 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Connector.h"
 
 #if TAO_HAS_UIOP == 1
@@ -16,11 +18,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID(Strategies,
-          UIOP_Connector,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connector::TAO_UIOP_Connector (void)
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index c49495ffb46..57060d5421d 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -1,19 +1,12 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Endpoint.h"
 #include "tao/Strategies/UIOP_Connection_Handler.h"
-
 #include "tao/ORB_Constants.h"
-
 #include "ace/OS_NS_string.h"
 
-
 #if TAO_HAS_UIOP == 1
 
-
-ACE_RCSID (Strategies,
-           UIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/UIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index b679a682428..c99d2f29191 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -7,17 +7,9 @@
 
 #include "tao/Strategies/UIOP_Acceptor.h"
 #include "tao/Strategies/UIOP_Connector.h"
-
 #include "tao/ORB_Constants.h"
-
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (Strategies,
-           UIOP_Factory,
-           "$Id$")
-
-
 static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 98a42cf3995..8cf254c9d6b 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Profile.h"
 
 #if TAO_HAS_UIOP == 1
@@ -14,10 +16,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Profile,
-           "$Id$")
-
 static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index c2d540c4a9e..c632dc5515c 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -15,11 +15,6 @@
 #include "tao/debug.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Transport,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 70a1fd881da..735321d25ed 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -35,8 +35,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(Strategies, advanced_resource, "$Id$")
-
 #if !defined (TAO_DEFAULT_REACTOR_TYPE)
 #define TAO_DEFAULT_REACTOR_TYPE TAO_REACTOR_TP
 #endif /* !TAO_DEFAULT_REACTOR_TYPE */
diff --git a/TAO/tao/String_Alloc.cpp b/TAO/tao/String_Alloc.cpp
index fbf074ec369..0f1dfdbf3e0 100644
--- a/TAO/tao/String_Alloc.cpp
+++ b/TAO/tao/String_Alloc.cpp
@@ -1,16 +1,11 @@
-#include "String_Alloc.h"
+// -*- C++ -*-
+// $Id$
 
+#include "tao/String_Alloc.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_Memory.h"
 
-// FUZZ: disable check_for_streams_include
-#include "ace/streams.h"
-
-ACE_RCSID (tao,
-           String_Alloc,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 419ba5cb684..a983f392794 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -27,10 +27,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tao,
-           TAO_Stub,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Stub::TAO_Stub (const char *repository_id,
@@ -227,7 +223,9 @@ TAO_Stub::object_key (void) const
   if (this->forward_profiles_)
     {
       // Double-checked
+      // FUZZ: disable check_for_ACE_Guard
       ACE_Guard<ACE_Lock> obj (*this->profile_lock_ptr_);
+      // FUZZ: enable check_for_ACE_Guard
 
       if (obj.locked () != 0 &&  this->forward_profiles_ != 0)
         return this->forward_profiles_->get_profile (0)->object_key ();
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 7e3009faa5e..5affe968bb9 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -29,12 +29,6 @@
 # include "tao/Synch_Invocation.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           Synch_Invocation,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -255,9 +249,9 @@ namespace TAO
      */
 
     bool const
-      expired= (max_wait_time && ACE_Time_Value::zero == *max_wait_time);
+      expired = (max_wait_time && ACE_Time_Value::zero == *max_wait_time);
     if (expired)
-      errno= ETIME;
+      errno = ETIME;
     int const
       reply_error = expired ? -1 :
         this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time, rd);
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 84677dd1d16..e5ad8c2b7b9 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,4 +1,5 @@
-// "$Id$"
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Synch_Queued_Message.h"
 #include "tao/debug.h"
@@ -7,10 +8,6 @@
 #include "ace/Malloc_T.h"
 #include "ace/Message_Block.h"
 
-ACE_RCSID (tao,
-           Synch_Queued_Message,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 20992fef308..71b9cc89401 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -5,11 +5,6 @@
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (tao,
-           Synch_Reply_Dispatcher,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 48f276b0541..cbd8b77202a 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -23,12 +23,6 @@
 # include "tao/SystemException.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           SystemException,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 5d39857ddbc..47b9ad4b09b 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/TAO_Internal.h"
@@ -32,10 +33,6 @@
 #include "ace/Static_Object_Lock.h"
 #include "ace/OS_NS_sys_stat.h"
 
-ACE_RCSID (tao,
-           TAO_Internal,
-           "$Id$")
-
 #ifndef TAO_DEFAULT_RESOURCE_FACTORY_ARGS
 #  define TAO_DEFAULT_RESOURCE_FACTORY_ARGS 0
 #endif  /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 256ce2339e9..88a1d7d7114 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -12,10 +12,6 @@
 # include "tao/TAO_Singleton_Manager.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           TAO_Singleton_Manager,
-           "$Id$")
-
 namespace
 {
   // Singleton instance pointer.
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index dea17e382d5..a7a88bf1b08 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -4,11 +4,6 @@
 #include "tao/GUIResource_Factory.h"
 #include "tao/TAO_Singleton.h"
 
-ACE_RCSID (tao,
-           TSS_Resources,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TSS_Resources::TAO_TSS_Resources (void)
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 28d22ce41ed..8a8a0efe2b5 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -9,11 +9,6 @@
 
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           Tagged_Components,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index 2555b4f113e..351dc7f05ab 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -13,10 +13,6 @@
 # include "tao/Tagged_Profile.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Tagged_Profile,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 083e90c39ae..36362b8fd77 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/Thread_Lane_Resources.h"
-
-ACE_RCSID (tao,
-           Thread_Lane_Resources,
-           "$Id$")
-
 #include "tao/Acceptor_Registry.h"
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index 8a3465d2648..76b2ed45db3 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Thread_Lane_Resources_Manager.h"
@@ -6,10 +7,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao,
-           Thread_Lane_Resources_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 884b7eff152..342018d9b08 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -6,10 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Flag_Manip.h"
 
-ACE_RCSID (tao,
-           Thread_Per_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler (
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index 70b51a2a9da..1a9d0161a60 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -4,11 +4,6 @@
 #include "tao/debug.h"
 #include "ace/TkReactor/TkReactor.h"
 
-ACE_RCSID( TAO_TkResource,
-           TkResource_Factory,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/TkResource/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index c598ef76c87..53b2a4739fa 100644
--- a/TAO/tao/TkResource/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -1,13 +1,9 @@
-//$Id$
+// $Id$
+
 #include "tao/TkResource/TkResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/TkResource/TkResource_Factory.h"
 
-ACE_RCSID( TAO_TkResource,
-           TkResource_Loader,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index ee0780a2bad..9fafb76c799 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -44,11 +44,6 @@
 # include "tao/Transport.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
-           Transport,
-           "$Id$")
-
 /*
  * Static function in file scope
  */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index 40b6dbba38f..270b4b5f75e 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -17,10 +17,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (TC,
-           Current_Loader,
-           "$Id$")
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
 #include "tao/TransportCurrent/Current_ORBInitializer.h"
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 0d3805fe791..be4b11446e1 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -17,10 +17,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/PI/PI.h"
 
-ACE_RCSID (Transport_Current,
-           IIOP_Current_Loader,
-           "$Id$")
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
 #include "tao/TransportCurrent/Current_ORBInitializer.h"
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index ef731e30c0f..95e0f05f530 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -13,10 +13,6 @@
 # include "tao/Transport_Cache_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Transport_Cache_Manager_T,
-           "$Id$")
-
 // notes on debug level and LM_xxxx codes for transport cache
 // TAO_debug_level > 0: recoverable error condition (LM_ERROR)
 // TAO_debug_level > 4: normal transport cache operations (LM_INFO)
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index b4c79292593..4faf44bc3be 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Transport_Connector.h"
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
@@ -23,10 +26,6 @@
 # include "tao/Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Connector,
-           "$Id$")
-
 namespace
 {
   class TransportCleanupGuard
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index f6c23268dc0..23c04a89277 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Transport_Descriptor_Interface.h"
 
 #if !defined (__ACE_INLINE__)
@@ -6,11 +8,6 @@
 
 #include "tao/Endpoint.h"
 
-ACE_RCSID (tao,
-           Transport_Descriptor_Interface,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index 196d7e6338c..cbefdeed656 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -2,11 +2,6 @@
 
 #include "tao/Transport_Mux_Strategy.h"
 
-ACE_RCSID (tao,
-           Transport_Mux_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index 21aca45f74c..be42402d42e 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -9,11 +9,6 @@
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (TypeCodeFactory,
-           Recursive_TypeCode,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 2453262a6f6..38aa0363b30 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -3,15 +3,8 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
-
 #include "tao/ORB_Core.h"
 
-
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_Adapter_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index e451b4c28a2..361f67485c2 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,6 +1,5 @@
 // -*- C++ -*-
 
-
 //=============================================================================
 /**
  *  @file    TypeCodeFactory_Loader.cpp
@@ -11,15 +10,10 @@
  */
 //=============================================================================
 
-
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(TypeCodeFactory,
-          TypeCodeFactory_Loader,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index f8204186c0b..ac81a7a31ce 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -34,10 +34,6 @@
 #include "ace/Value_Ptr.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TCF
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index 1dbec9f2dea..54fc4f61728 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -1,13 +1,9 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/TypeCodeFactory_Adapter.h"
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao,
-           TypeCodeFactory_Adapter,
-           "$Id$")
-
 TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
 {
 }
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 638f895b362..bfb82367587 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -9,11 +9,6 @@
 # include "tao/UserException.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           UserException,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Virtual.  Do not inline.
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index 1cdb4fc3087..f681c20b7de 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Utils/Implicit_Deactivator.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-ACE_RCSID (Utils,
-           Implicit_Deactivator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 53b9e90a757..593f50b40f4 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -1,9 +1,6 @@
-#include "tao/Utils/ORB_Destroyer.h"
-
+// $Id$
 
-ACE_RCSID (Utils,
-           ORB_Destroyer,
-           "$Id$")
+#include "tao/Utils/ORB_Destroyer.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index aba6b9ff4ee..9c200c0263e 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -1,14 +1,7 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
 // = AUTHOR
 //    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
 
 #include "tao/Utils/ORB_Manager.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
@@ -22,11 +15,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ORB_Manager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // constructor
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index c0d4882492f..adc8436e240 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "tao/Utils/PolicyList_Destroyer.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Utils/PolicyList_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Utils,
-           PolicyList_Deactivator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() throw ()
diff --git a/TAO/tao/Utils/Servant_Var.cpp b/TAO/tao/Utils/Servant_Var.cpp
index 1506ae356bc..4d2cbd876b7 100644
--- a/TAO/tao/Utils/Servant_Var.cpp
+++ b/TAO/tao/Utils/Servant_Var.cpp
@@ -7,8 +7,4 @@
 # include "tao/Utils/Servant_Var.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Utils,
-           Servant_Var,
-           "$Id$")
-
 #endif /*TAO_UTILS_SERVANT_VAR_CPP*/
diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp
index 44f0b01c19d..bb838bec34d 100644
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ b/TAO/tao/Utils/Synch_Refcountable.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Utils/Synch_Refcountable.h"
 
 #if !defined (__ACE_INLINE__)
@@ -6,11 +8,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Utils,
-           Synch_Refcountable,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount)
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 42cf8207876..6ee56035c49 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/Valuetype_Adapter.h"
 
-ACE_RCSID (tao,
-           Valuetype_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
diff --git a/TAO/tao/Valuetype_Adapter_Factory.cpp b/TAO/tao/Valuetype_Adapter_Factory.cpp
index 5cee721f6af..dffbe20ca95 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.cpp
+++ b/TAO/tao/Valuetype_Adapter_Factory.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "tao/Valuetype_Adapter_Factory.h"
 
-ACE_RCSID (tao,
-           Valuetype_Adapter_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory (void)
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 4d9c205610b..f97d32ae5ae 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -7,10 +7,6 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/debug.h"
 
-ACE_RCSID(tao,
-          Wait_On_LF_No_Upcall,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index c9afa361710..75c8282e18a 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -7,10 +7,6 @@
 #include "tao/Synch_Reply_Dispatcher.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao,
-           Wait_On_Leader_Follower,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 768bf83ce3f..2cc6c83ffe4 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -8,10 +8,6 @@
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 
-ACE_RCSID (tao,
-           Wait_On_Reactor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 3e3366136bb..d38d0232a81 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -9,10 +9,6 @@
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 
-ACE_RCSID (tao,
-           Wait_On_Read,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index a0f49b621ff..c310221b7ad 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -4,10 +4,6 @@
 
 //@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
 
-ACE_RCSID (tao,
-           Wait_Strategy,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index 1b192ab401a..81191df1ebc 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/XtReactor/XtReactor.h"
 
-ACE_RCSID( TAO_XtResource,
-           XtResource_Factory,
-           "$Id$");
-
 namespace TAO
 {
 
diff --git a/TAO/tao/XtResource/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp
index fb24c916b04..50b60654fa4 100644
--- a/TAO/tao/XtResource/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource/XtResource_Loader.cpp
@@ -3,10 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/XtResource/XtResource_Factory.h"
 
-ACE_RCSID( TAO_XtResource,
-           XtResource_Loader,
-           "$Id$");
-
 namespace TAO
 {
 
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp
index 11c5ce52f3e..91ed6434e01 100644
--- a/TAO/tao/ZIOP/ZIOP.cpp
+++ b/TAO/tao/ZIOP/ZIOP.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_ORBInitializer.h"
 #include "tao/ZIOP/ZIOP_Policy_Validator.h"
 #include "tao/ZIOP/ZIOP.h"
@@ -8,10 +10,6 @@
 #include "tao/Stub.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Loader::TAO_ZIOP_Loader (void)
diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
index 9d9309925f3..a1493b3b724 100644
--- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
+++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_ORBInitializer::TAO_ZIOP_ORBInitializer (TAO_ZIOP_Loader* loader) : loader_ (loader)
diff --git a/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp b/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
index dcf763a285b..c0ac5660d0d 100644
--- a/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_PolicyFactory.h"
 #include "tao/ZIOP/ZIOP.h"
 #include "tao/ZIOP/ZIOP_Policy_i.h"
@@ -5,10 +7,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (ZIOP_GIOP,
-           ZIOP_PolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
index 9d079b1fe2d..e22be74c97d 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -6,10 +8,6 @@
 #include "tao/Policy_Set.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (ZIOP_GIOP,
-           ZIOPPolicy_Validator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOPPolicy_Validator::TAO_ZIOPPolicy_Validator (TAO_ORB_Core &orb_core)
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
index 8a25e5b902c..1a31b1a54e5 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -1,16 +1,11 @@
 // $Id$
 
 #include "tao/ZIOP/ZIOP_Policy_i.h"
-
 #include "tao/CDR.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Policy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
index 7e0ad04cfec..b8f4614192c 100644
--- a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (ZIOP,
-           ZIOP_Service_Context_Handler,
-           "$Id$")
-
 #include "tao/CDR.h"
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp
index fb245ff9cfe..61d261f4d0a 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp
@@ -11,10 +11,6 @@
 #include "tao/Policy_Manager.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Stub,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Stub::TAO_ZIOP_Stub (const char *repository_id,
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
index e9c55ca7507..8f5080d82e4 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -10,10 +10,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Stub_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory (void)
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 39c3b7ff14f..45275055613 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -1,3 +1,4 @@
+// $Id$
 // THREADING NOTE: the global values here  (debug_{level,filter,stream)
 // are assumed to be modified "safely", e.g. in the main thread as
 // part of process initialization.  They are treated as immutable
@@ -7,10 +8,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (tao,
-           debug,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Export unsigned int TAO_debug_level = 0;
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 14bceeee6a3..c17dc12b627 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/default_client.h"
@@ -18,11 +19,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           default_client,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 9b13d90abfa..fc35f10d2cf 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/default_resource.h"
@@ -27,10 +28,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (tao,
-           default_resource,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Codeset_Parameters::TAO_Codeset_Parameters (void)
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index a2b920384be..a9a07a7181e 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
-           default_server,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 81a3229e9fb..916cb7876e9 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -15,10 +15,6 @@
 # include "tao/operation_details.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           operation_details,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Exception *
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index aa56422ed7a..4008d358ca9 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -11,10 +11,6 @@
 #include "ace/Service_Config.h"
 #include "tao/Invocation_Utils.h"
 
-ACE_RCSID (tao,
-           params,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp
index 5f15463f345..9efae876cf8 100644
--- a/TAO/tao/target_specification.cpp
+++ b/TAO/tao/target_specification.cpp
@@ -1,4 +1,3 @@
-
 //$Id$
 
 #include "tao/target_specification.h"
@@ -7,6 +6,3 @@
 #include "tao/target_specification.inl"
 #endif /* !defined INLINE */
 
-ACE_RCSID (tao, 
-           target_specification, 
-           "$Id$")