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

63 files changed, 0 insertions, 114 deletions

diff --git a/CIAO/ciao/Valuetype_Factories/Factories.mpc b/CIAO/ciao/Valuetype_Factories/Factories.mpc
index af80c58ca20..ed2966099b4 100644
--- a/CIAO/ciao/Valuetype_Factories/Factories.mpc
+++ b/CIAO/ciao/Valuetype_Factories/Factories.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(CCM_Cookie_Factory) : install, ccm_stub, ciao_lib {
    dynamicflags += COOKIE_FACTORY_BUILD_DLL
    Source_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
index 2b4a6bf5194..ca811ce932a 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DDS_SUB_IDL
 #define DDS_SUB_IDL
 
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
index e7de0623ff4..28225040991 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef COLLACATED_CONNECTOR_
 #define COLLACATED_CONNECTOR_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
index 44d1db39e96..b2dd688bb25 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DEADLINE_QOS_TEST_H_
 #define DEADLINE_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
index ca6b7b42f9c..941a0fcbf81 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DEST_ORDER_QOS_TEST_H_
 #define DEST_ORDER_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
index 114c81f824a..ee6daf56d75 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DP_FACTORY_QOS_TEST_H_
 #define DP_FACTORY_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
index 7d6f4779f0f..e18a64c6481 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DOMAINPARTICIPANT_QOS_TEST_H_
 #define DOMAINPARTICIPANT_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
index 15fb237e1a4..07d6aa9b9b2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DURABILITY_QOS_TEST_H_
 #define DURABILITY_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
index b57191c3a70..5fde21bca60 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DURABILITY_SERVICE_QOS_TEST_H_
 #define DURABILITY_SERVICE_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
index 83d0483c909..a7d652b93c7 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "duration.h"
 
 Duration::Duration ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
index b33dc679ac7..abf2962c1a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef DURATION_H_
 #define DURATION_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
index 9425f40fbd7..5776a879e7e 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef HISTORY_QOS_TEST_H_
 #define HISTORY_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
index b4aa84f5848..968011fc581 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef LATENCY_BUDGET_QOS_TEST_H_
 #define LATENCY_BUDGET_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
index cfafa038131..0977e58ccdc 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef LIFESPAN_QOS_TEST_H_
 #define LIFESPAN_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
index b62b22150be..7fea05b6670 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef LIVELINESS_QOS_TEST_H_
 #define LIVELINESS_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
index 9912b6f1eee..a3399da99d1 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "octet_seq.h"
 
 OctetSequence::OctetSequence ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
index 0b9c1abe0f7..f17bf8e0aab 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef OCTET_SEQ_H_
 #define OCTET_SEQ_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
index c1c5ae57034..f1deb5aa63f 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef OWNERSHIP_QOS_TEST_H_
 #define OWNERSHIP_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
index c4680b396e9..fe46ea19f39 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_
 #define OWNERSHIP_STRENGTH_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
index 286e23dd92d..329348a6d72 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef PARTITION_QOS_TEST_H_
 #define PARTITION_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
index 0358925fbff..6acfd5da5b2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef PRESENTATION_QOS_TEST_H_
 #define PRESENTATION_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
index a0c5d685381..6eff701402b 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_
 #define READER_DATA_LIFECYCLE_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
index f4116698f2f..45887016444 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef RELIABILITY_QOS_TEST_H_
 #define RELIABILITY_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
index 9d57f139d54..51d1bf84240 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef RESOURCE_LIMITS_QOS_TEST_H_
 #define RESOURCE_LIMITS_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
index ed5a339f3e3..78aeaad0098 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "string_seq.h"
 
 StringSequence::StringSequence ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
index 84840d8753d..17d7e9419a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef STRING_SEQ_H_
 #define STRING_SEQ_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
index c67c9593aad..832aa73a055 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TIME_BASED_FILTER_QOS_TEST_H_
 #define TIME_BASED_FILTER_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
index 373086ac034..94707413a0a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TOPIC_DATA_QOS_TEST_H_
 #define TOPIC_DATA_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
index dd94d6d65bb..fdc5ccf6155 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TRANSPORT_PRIORITY_QOS_TEST_H_
 #define TRANSPORT_PRIORITY_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
index e9db0f811d4..ba06c6420cd 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
 #define TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
index e6848e25e66..e0ce81b4159 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef USER_DATA_QOS_TEST_H_
 #define USER_DATA_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
index e8694e3c3c1..05536fc3dcd 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_
 #define WRITER_DATA_LIFECYCLE_QOS_TEST_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
index 56ac8f1daa2..fe3281faba3 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file SenderDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
index a89be8e0002..e60e2bb678c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file SenderDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
index 7189a56c2e8..a73c5ac6764 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file ReceiverDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
index 188954c8b23..3002014b755 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file SenderDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
index 9f0535437c9..de62aa77ca1 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file ReceiverDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
index 69163d68adf..b55e57cb764 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file SenderDriver.cpp
  *
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
index cb44c82cdca..a1af31c4139 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef SHAPES_DEFN_IDL_
 #define SHAPES_DEFN_IDL_
 
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
index cf020aeab1a..b68180f8847 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef BMCLOSEDED_IDL
 #define BMCLOSEDED_IDL
 
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.idl b/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
index ef2e39caa38..ae7a2ddd430 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
@@ -1,4 +1,3 @@
-//$Id$
 //=============================================================================
 /**
  * @file BMDevice.idl
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
index 1bcf144de33..84426657b89 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef BMDISPLAY_IDL
 #define BMDISPLAY_IDL
 
diff --git a/CIAO/examples/Hello_Event/Sender/Sender.idl b/CIAO/examples/Hello_Event/Sender/Sender.idl
index edf43943bfc..22ec7c31a23 100644
--- a/CIAO/examples/Hello_Event/Sender/Sender.idl
+++ b/CIAO/examples/Hello_Event/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef SENDER_IDL
 #define SENDER_IDL
 
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
index 1e486f79595..f333d77cecd 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TSEC_CHECKPOINT_IDL
 #define TSEC_CHECKPOINT_IDL
 
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 0745726bd2f..2659a2d202d 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(TSEC_CheckPoint_idl_gen) : componentidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
index 8f2b0c02d3d..1ea3a4050c8 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 //-------------------------------------------------------------------
 // Includes
 //-------------------------------------------------------------------
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
index 7f09543ea32..c3c67a7152f 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
@@ -1,5 +1,3 @@
-//$Id$
-
 //===================================================================
 /**
  * @file TSEC_CheckPoint_exec.h
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
index 8901cdbf20a..b4b084c2a16 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 
 /**
  * @file controller.cpp
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
index 64f3458084c..a194b076455 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ENW_IDL
 #define ENW_IDL
 
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
index 0c5f08c1101..f505a3936e4 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
 project(ENW_stub): ccm_stub, avoids_ccm_noevent {
   sharedname = ENW_stub
   idlflags -= -GT
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
index 239fb03eefe..7ef82b0ba4e 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.idl
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Basic.idl"
 
 module Basic
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
index cfde3670c43..d8fa2858142 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file Tester.cpp
  *
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
index 71a1bc8cd45..0dd828392ba 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file Tester.cpp
  *
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
index 239fb03eefe..7ef82b0ba4e 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Basic.idl"
 
 module Basic
diff --git a/CIAO/tests/Minimum/Sender/Sender.idl b/CIAO/tests/Minimum/Sender/Sender.idl
index dc1548f5394..cfba67809a3 100644
--- a/CIAO/tests/Minimum/Sender/Sender.idl
+++ b/CIAO/tests/Minimum/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef CIAO_SENDER_IDL
 #define CIAO_SENDER_IDL
 
diff --git a/CIAO/tests/TTSCTest/Sender/Sender.idl b/CIAO/tests/TTSCTest/Sender/Sender.idl
index ce464755c58..a1ba57fe560 100644
--- a/CIAO/tests/TTSCTest/Sender/Sender.idl
+++ b/CIAO/tests/TTSCTest/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef SENDER_IDL
 #define SENDER_IDL
 
diff --git a/CIAO/tests/TTSConnContext/Sender/Sender.idl b/CIAO/tests/TTSConnContext/Sender/Sender.idl
index ce464755c58..a1ba57fe560 100644
--- a/CIAO/tests/TTSConnContext/Sender/Sender.idl
+++ b/CIAO/tests/TTSConnContext/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef SENDER_IDL
 #define SENDER_IDL
 
diff --git a/CIAO/tests/Thread/Sender/Sender.idl b/CIAO/tests/Thread/Sender/Sender.idl
index 95f21a846e6..6315a7afff9 100644
--- a/CIAO/tests/Thread/Sender/Sender.idl
+++ b/CIAO/tests/Thread/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef SENDER_IDL
 #define SENDER_IDL
 
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
index 24b23230d84..81afd2a5d0c 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef STOCKBROKER_IDL
 #define STOCKBROKER_IDL
 
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp b/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
index 503271abe90..756bda55453 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file StockBrokerDriver.cpp
  *
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
index 0f50b39b57b..68fce4853e6 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef STOCKDISTRIBUTOR_IDL
 #define STOCKDISTRIBUTOR_IDL
 
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
index 6a070280425..d7bf054ebc5 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * @file StockDistributorDriver.cpp
  *
diff --git a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
index 7f33f445254..761d8778287 100644
--- a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
+++ b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef STOCK_BASE_IDL
 #define STOCK_BASE_IDL