10 files changed, 20 insertions, 45 deletions
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