Zapped c-style id tag with no space between // and $Id$

83 files changed, 0 insertions, 133 deletions

diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
index b332f045b08..aab09a00a2f 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
   custom_only = 1
   idlflags += -Gp -Gd -Sci -SS -GA \
diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl
index cb1fb80d2c4..281a0225f2f 100644
--- a/TAO/tao/AnyTypeCode/Marshal.inl
+++ b/TAO/tao/AnyTypeCode/Marshal.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index 85b5aa7532d..a3ab61af4b8 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T, typename T_slice, typename TAG>
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 01754449b5a..4a4f834c157 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/Base_Transport_Property.h"
 #include "ace/OS_Memory.h"
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
index f1c6a688be0..c6b65aac932 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc
index ab92c149e34..e79c866a5f1 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework.mpc
+++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
index cc5c7336604..e847137d0ee 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(CSD_ThreadPool) : csd_framework, tao_output, install, threads {
   sharedname   = TAO_CSD_ThreadPool
   dynamicflags += TAO_CSD_TP_BUILD_DLL
diff --git a/TAO/tao/CodecFactory/CodecFactory.mpc b/TAO/tao/CodecFactory/CodecFactory.mpc
index cbda75b62d4..09c20ed30bc 100644
--- a/TAO/tao/CodecFactory/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory/CodecFactory.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Codeset/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc
index 0f0936fe8fb..53edba39202 100644
--- a/TAO/tao/Codeset/Codeset.mpc
+++ b/TAO/tao/Codeset/Codeset.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   idlflags += -SS -Sci -Sorb \
diff --git a/TAO/tao/Compression/Compression.mpc b/TAO/tao/Compression/Compression.mpc
index df3b9098c3f..928f06a9f91 100644
--- a/TAO/tao/Compression/Compression.mpc
+++ b/TAO/tao/Compression/Compression.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   idlflags += -SS -Sorb -Sci -GA \
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
index 37d8e57d15e..ace59637cc5 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
   requires += bzip2
   sharedname   = TAO_Bzip2Compressor
diff --git a/TAO/tao/Compression/lzo/LzoCompressor.mpc b/TAO/tao/Compression/lzo/LzoCompressor.mpc
index dff84ee46ff..66311f6e6e7 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor.mpc
+++ b/TAO/tao/Compression/lzo/LzoCompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
   requires += lzo1
   sharedname   = TAO_LzoCompressor
diff --git a/TAO/tao/Compression/rle/RLECompressor.mpc b/TAO/tao/Compression/rle/RLECompressor.mpc
index 784f6c35eff..d17adf9901b 100644
--- a/TAO/tao/Compression/rle/RLECompressor.mpc
+++ b/TAO/tao/Compression/rle/RLECompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(RLECompressor) : ace_rlecompressionlib, taolib, tao_output, install, compression, taoidldefaults {
   sharedname    = TAO_RLECompressor
   dynamicflags += TAO_RLECOMPRESSOR_BUILD_DLL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.mpc b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
index abf165babdd..a8dad50d86a 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.mpc
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
   requires += zlib
   sharedname   = TAO_ZlibCompressor
diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl
index 0e69d8b1bf1..c51494ec098 100644
--- a/TAO/tao/Condition.inl
+++ b/TAO/tao/Condition.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class MUTEX> ACE_INLINE int
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 75ad2dbf6c0..a6c8dc8b242 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 #include "tao/Transport.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
index 27e08e239c8..0894056e55d 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, tao_no_iiop, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc
index e0582ec7226..5ab00b1a288 100644
--- a/TAO/tao/DynamicAny/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny/DynamicAny.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, valuetype, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index ef0170fa16c..4de7ddaa17a 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/DynamicInterface/DII_Invocation_Adapter.h"
diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc
index 823176ca877..c4435f73867 100644
--- a/TAO/tao/DynamicInterface/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba {
   sharedname   = TAO_DynamicInterface
   dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP.mpc b/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
index 764cc76884b..29303146935 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
+++ b/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(Dynamic_TP) : taolib, tao_output, install, pi, csd_framework, csd_threadpool {
   sharedname   = TAO_Dynamic_TP
   dynamicflags += TAO_DYNAMIC_TP_BUILD_DLL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
index 297c2c36364..b20fc829e78 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Fault_Tolerance_Service.inl b/TAO/tao/Fault_Tolerance_Service.inl
index f655d681151..bc2ab62f6c2 100644
--- a/TAO/tao/Fault_Tolerance_Service.inl
+++ b/TAO/tao/Fault_Tolerance_Service.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp
index 0cca01ab3f1..c3549b3d95f 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/FoxResource/FoxResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/FoxReactor/FoxReactor.h"
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.cpp b/TAO/tao/FoxResource/FoxResource_Loader.cpp
index 31be07916ba..e60dd560464 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Loader.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/FoxResource/FoxResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/FoxResource/FoxResource_Factory.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
index 5babb648382..22679950ba9 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
index 06da7d61ca6..09e4eb7b76a 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/GIOP_Message_Locate_Header.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl
index 8094b30c50e..9a97ae2d600 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.inl
+++ b/TAO/tao/GIOP_Message_Locate_Header.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
index 3298ee8d319..ca6e573d523 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
index 6db2e26f688..c78ee53502f 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index 33695590b87..27f7a008861 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/GUIResource_Factory.h"
 #include "ace/Reactor.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
index 23619c3fcda..a9473844267 100644
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client/IFR_Client.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   idlflags += -GX \
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc
index a103ae5081b..43756dd615c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc
index 44643141187..6f2e8b2a1d4 100644
--- a/TAO/tao/IORManipulation/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation/IORManipulation.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/IORTable/Async_IORTable.mpc b/TAO/tao/IORTable/Async_IORTable.mpc
index 043295a7122..a64668873fc 100644
--- a/TAO/tao/IORTable/Async_IORTable.mpc
+++ b/TAO/tao/IORTable/Async_IORTable.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc
index a3292cb6714..9a1f0f2ec85 100644
--- a/TAO/tao/IORTable/IORTable.mpc
+++ b/TAO/tao/IORTable/IORTable.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc
index adeaf26911e..d839e33cf84 100644
--- a/TAO/tao/ImR_Client/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client/ImR_Client.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
index 484355fca1e..f9623de1742 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl
index d3420eb394f..3f785c36c71 100644
--- a/TAO/tao/Incoming_Message_Stack.inl
+++ b/TAO/tao/Incoming_Message_Stack.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /************************************************************************/
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 752860ba877..913169b2ad6 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/Invocation_Endpoint_Selectors.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc
index 06d2cc6ddc2..a9c2aaf2841 100644
--- a/TAO/tao/Messaging/Messaging.mpc
+++ b/TAO/tao/Messaging/Messaging.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc
index 7b8f3cb270d..4ceb503f5df 100644
--- a/TAO/tao/Monitor/Monitor.mpc
+++ b/TAO/tao/Monitor/Monitor.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project (*idl): tao_versioning_idl_defaults, install {
   custom_only = 1
   idlflags += -Gp -Gd -GA \
diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
index 8ac8d28a1d6..94113224698 100644
--- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/PI/PI.mpc b/TAO/tao/PI/PI.mpc
index b32de399473..62b3b405000 100644
--- a/TAO/tao/PI/PI.mpc
+++ b/TAO/tao/PI/PI.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
   custom_only = 1
   idlflags += -SS -Sci -Gp -Gd \
diff --git a/TAO/tao/PI_Server/PI_Server.mpc b/TAO/tao/PI_Server/PI_Server.mpc
index cad94e5df51..94034614dec 100644
--- a/TAO/tao/PI_Server/PI_Server.mpc
+++ b/TAO/tao/PI_Server/PI_Server.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
   custom_only = 1
   idlflags += \
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index e6e8a28c993..fd43f298cee 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl
index 3af24e41ef7..2dd22a60f12 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.inl
+++ b/TAO/tao/Pluggable_Messaging_Utils.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp
index 155f82be0db..3ba55302382 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/PolicyFactory_Registry_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index b6a94a51993..572842ebe02 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Servant_Upcall.h"
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
index fec90ddd602..85b1ae474cd 100644
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ b/TAO/tao/PortableServer/PortableServer.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index cef6c5155ee..b65474c89fa 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/QtResource/QtResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/QtReactor/QtReactor.h"
diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index a42e670a821..284077df372 100644
--- a/TAO/tao/QtResource/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/QtResource/QtResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/QtResource/QtResource_Factory.h"
diff --git a/TAO/tao/Queued_Data.inl b/TAO/tao/Queued_Data.inl
index 1508377fc05..c5cf403eafb 100644
--- a/TAO/tao/Queued_Data.inl
+++ b/TAO/tao/Queued_Data.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /*static*/
diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc
index b466e85f9c3..e5d52fb8488 100644
--- a/TAO/tao/RTCORBA/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA/RTCORBA.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install {
   custom_only = 1
   idlflags    += -Sci -SS -Sorb -GX \
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc
index 0fed8f40069..d8d2c4761ed 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
   custom_only = 1
   idlflags += -Sci -SS -Sorb -GX \
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index 7d8a6a0dc1f..d9b29cfdf5c 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/RTScheduling/Distributable_Thread.h"
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index 82800837491..3b57102d827 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 
-//$Id$
-
 #ifndef DISTRIBUTABLE_THREAD_H
 #define DISTRIBUTABLE_THREAD_H
 
diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc
index 530cd6fefa3..4d61ef78f1b 100644
--- a/TAO/tao/RTScheduling/RTScheduler.mpc
+++ b/TAO/tao/RTScheduling/RTScheduler.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 71738b887bb..37c187c7ad9 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 447592830bb..5eaffea8a89 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 #ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 #define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index 4c389996499..bd71b13b901 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -1,6 +1,5 @@
 // -*- C++ -*-
 
-//$Id$
 #ifndef TAO_ThreadAction_H
 #define TAO_ThreadAction_H
 
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index 0b3e4392b4e..4e284f3da03 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/Remote_Invocation.h"
 #include "tao/Profile.h"
 #include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index 04e538f537f..bf3c8e973a2 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
index 80e460f6cf2..2dd32fead2c 100644
--- a/TAO/tao/Seq_Out_T.inl
+++ b/TAO/tao/Seq_Out_T.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc
index 6951bf47f2a..786ca9d2e3f 100644
--- a/TAO/tao/SmartProxies/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies/SmartProxies.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults {
   sharedname   = TAO_SmartProxies
   dynamicflags += TAO_SMARTPROXIES_BUILD_DLL
diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc
index 6940d823875..3d6ce6d7278 100644
--- a/TAO/tao/Strategies/Strategies.mpc
+++ b/TAO/tao/Strategies/Strategies.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 342018d9b08..c665403fc14 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/Thread_Per_Connection_Handler.h"
 #include "tao/Connection_Handler.h"
 #include "tao/debug.h"
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index b8cfe45001a..7fec8956aa6 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/TkResource/TkResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/TkReactor/TkReactor.h"
diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc
index 46bacb2cf03..a9c8d857db4 100644
--- a/TAO/tao/TransportCurrent/TC.mpc
+++ b/TAO/tao/TransportCurrent/TC.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : taolib_with_idl, tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc
index 2f8acb6e99e..7db3d504228 100644
--- a/TAO/tao/TransportCurrent/TC_IIOP.mpc
+++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index d02e619272a..0035cadcd2d 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/Transport_Cache_Manager_T.h"
 #include "tao/debug.h"
 #include "tao/Connection_Purging_Strategy.h"
diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl
index faadb1190b6..9c4e8c8ef0c 100644
--- a/TAO/tao/Transport_Cache_Manager_T.inl
+++ b/TAO/tao/Transport_Cache_Manager_T.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 4e667f946a9..53a1cf35bf1 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
index 328cef556ad..f83cdb28066 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc
index a84d2524660..ea77f5d08f0 100644
--- a/TAO/tao/Valuetype/Valuetype.mpc
+++ b/TAO/tao/Valuetype/Valuetype.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/Wait_Strategy.inl b/TAO/tao/Wait_Strategy.inl
index c39b083c95e..ba6720dd49b 100644
--- a/TAO/tao/Wait_Strategy.inl
+++ b/TAO/tao/Wait_Strategy.inl
@@ -1,5 +1,3 @@
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE bool
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index 17f3a88f604..637a783140a 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/XtResource/XtResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/XtReactor/XtReactor.h"
diff --git a/TAO/tao/XtResource/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp
index 2208494fe7a..95078ee11d4 100644
--- a/TAO/tao/XtResource/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource/XtResource_Loader.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/XtResource/XtResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/XtResource/XtResource_Factory.h"
diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc
index 8eb56e3ae18..25667a5f478 100644
--- a/TAO/tao/ZIOP/ZIOP.mpc
+++ b/TAO/tao/ZIOP/ZIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*core_idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 916cb7876e9..2c0bd86b0c1 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/operation_details.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl
index cbd733b5838..e012c99347a 100644
--- a/TAO/tao/operation_details.inl
+++ b/TAO/tao/operation_details.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp
index 9efae876cf8..0e2c3fffa3c 100644
--- a/TAO/tao/target_specification.cpp
+++ b/TAO/tao/target_specification.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "tao/target_specification.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/target_specification.inl b/TAO/tao/target_specification.inl
index dd1265bf0df..cd58417e335 100644
--- a/TAO/tao/target_specification.inl
+++ b/TAO/tao/target_specification.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE