summaryrefslogtreecommitdiff
path: root/TAO/DevGuideExamples
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/DevGuideExamples')
-rw-r--r--TAO/DevGuideExamples/AMH/AMH.mpc2
-rw-r--r--TAO/DevGuideExamples/AMH/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/AMH/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/amh_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/amh_pch.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/client.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner.idl2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_cb.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_server.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle.idl2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle_server.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/started_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/started_pch.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/common.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/common.h2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger.idl2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger_i.h2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/_pch.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/bank.idl2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/client.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/server.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h2
163 files changed, 0 insertions, 326 deletions
diff --git a/TAO/DevGuideExamples/AMH/AMH.mpc b/TAO/DevGuideExamples/AMH/AMH.mpc
index c18e3368bb1..299504deaae 100644
--- a/TAO/DevGuideExamples/AMH/AMH.mpc
+++ b/TAO/DevGuideExamples/AMH/AMH.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, amh {
idlflags += -Wb,pch_include=amh_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/AMH/Messenger.idl b/TAO/DevGuideExamples/AMH/Messenger.idl
index 55d4aba1c5e..b307589b231 100644
--- a/TAO/DevGuideExamples/AMH/Messenger.idl
+++ b/TAO/DevGuideExamples/AMH/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
module DevGuide
diff --git a/TAO/DevGuideExamples/AMH/MessengerClient.cpp b/TAO/DevGuideExamples/AMH/MessengerClient.cpp
index c6145c5bad4..ed1b5ca729f 100644
--- a/TAO/DevGuideExamples/AMH/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/AMH/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_pch.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/AMH/MessengerServer.cpp b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
index ae8fb522e47..0ff76911638 100644
--- a/TAO/DevGuideExamples/AMH/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_pch.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/AMH/amh_pch.cpp b/TAO/DevGuideExamples/AMH/amh_pch.cpp
index 1217d4e0504..ab632ec71cb 100644
--- a/TAO/DevGuideExamples/AMH/amh_pch.cpp
+++ b/TAO/DevGuideExamples/AMH/amh_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "amh_pch.h"
diff --git a/TAO/DevGuideExamples/AMH/amh_pch.h b/TAO/DevGuideExamples/AMH/amh_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/AMH/amh_pch.h
+++ b/TAO/DevGuideExamples/AMH/amh_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
index 1f9756ac1ee..256f03cbbdb 100644
--- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
+++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, amh, ami {
idlflags += -Wb,pch_include=amh_ami_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
index 4931b9c9efe..b7aa56c8c40 100644
--- a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "amh_ami_pch.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
+++ b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/client.cpp b/TAO/DevGuideExamples/AMH_AMI/client.cpp
index d5912c43c4f..3a52873f2e0 100644
--- a/TAO/DevGuideExamples/AMH_AMI/client.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "ace/Get_Opt.h"
#include "middleC.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner.idl b/TAO/DevGuideExamples/AMH_AMI/inner.idl
index 7e0b6693b96..77a86167084 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner.idl
+++ b/TAO/DevGuideExamples/AMH_AMI/inner.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// file: inner.idl
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
index 68f7bb4b63c..6ce5e712976 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "inner_cb.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
index 92745ba5001..1c5da919e7b 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
@@ -1,5 +1,3 @@
-// $Id$
-
// -*- C++ -*-
#ifndef INNER_CB_H
#define INNER_CB_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
index e9dfe2f872e..739ee5c0da2 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "inner_i.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle.idl b/TAO/DevGuideExamples/AMH_AMI/middle.idl
index a81f96ee214..eb15857ba67 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle.idl
+++ b/TAO/DevGuideExamples/AMH_AMI/middle.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// file: middle.idl
interface Middle
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
index ede0bac8250..42a638c4fed 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "middle_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
index 65fd05368de..5d4e0a05f11 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,pch_include=bidir_giop_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
index 81730edc1f9..570337d5803 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "bidir_giop_pch.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
index 9b28ecbd8ad..cc3b7dd664f 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BIDIR_GIOP_PCH_H
#define BIDIR_GIOP_PCH_H
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl b/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
index b36b1182bde..ddb989750a2 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Callback
{
// A safe way to shutdown the client, using either clean shutdowns
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
index 25dee372b33..91143969b3c 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "callback_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
index b7623dd1829..dc70a79ed39 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CALLBACKI_H_
#define CALLBACKI_H_
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
index 369dc556de1..5b1167b9622 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "callback_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
index 617a933d85d..ad4b3224ab9 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "simple_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl b/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
index cb98b3cadeb..e6ef4fffa86 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "callback.idl"
interface Simple
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
index e93e0e8b78b..32c5f1c39b4 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "simple_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
index 8d6c0aecc40..614ccafecda 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLEI_H_
#define SIMPLEI_H_
diff --git a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
index 40b2da5838d..71a0bbef8be 100644
--- a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
+++ b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,pch_include=started_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger.idl b/TAO/DevGuideExamples/GettingStarted/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger.idl
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
index 3f41a9b2e3b..6f0c98be0d0 100644
--- a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
index 057681e8ad7..a02b63f384b 100644
--- a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/started_pch.cpp b/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
index c2c8b943b32..c7253a683cd 100644
--- a/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "started_pch.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/started_pch.h b/TAO/DevGuideExamples/GettingStarted/started_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/GettingStarted/started_pch.h
+++ b/TAO/DevGuideExamples/GettingStarted/started_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
index c081d4e7d6c..da899e4aebe 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
local interface Messenger
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
index df7e7ecddd0..2489e6d0d38 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(LocalObject*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
index ca25998b65b..dca6a836668 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
int ACE_TMAIN (int, ACE_TCHAR **)
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 9c3f7306a6f..24eb1aab429 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index 92d6825db32..cb0454e8fdc 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
index 63a282a1850..d8d928a1c07 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
index 8eb8b435997..9519691d282 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
index 876fc1e4ac3..a3bb99603c0 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerLocator_i.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
index ba0da517de5..a1d9ade73dd 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_LOCATOR_I_H
#define MESSENGER_LOCATOR_I_H
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
index 8cb1f57ff63..b15baad88cb 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerLocator_i.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
index e1b7628f933..37814e75278 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
index ed176d4530e..cdebd195ec1 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
Messenger_i.cpp
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
index 6488044fc67..58a5793b28b 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
exception MessengerUnableToSendMessage
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
index d2cd1ef0502..0bb8b9d3a8d 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "MessengerHandler.h"
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 60c8dac7e12..0b0ab15cd8c 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerHandler.h"
#include "ace/OS_NS_time.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 5a12435881d..951028cf9e4 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERHANDLER_H
#define MESSENGERHANDLER_H
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
index 18d792ccc13..becda190ed2 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <fstream>
#include <iostream>
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
index a4f9437effa..a47d0443e66 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "tao/TimeBaseC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
index 83f9c51a02d..e0c8900a624 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
index d130dc8a43e..68bbd34859f 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
index c1d7a99cf26..236882a41c3 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
idlflags += -Wb,pch_include=started_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
index 3f41a9b2e3b..6f0c98be0d0 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
index b148b7f2494..40e5462adaf 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
index c2c8b943b32..c7253a683cd 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "started_pch.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
index 174cf26332f..4409d45b063 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
index f598ee0d2b0..30bc8126513 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
index 5c5aef8f034..769f2b7c0b9 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
index b249ddc8228..bb4ae1a774c 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerServer.h"
#include "Messenger_i.h"
#include "MessengerShutdownTimer.h"
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
index abef2390901..cfa92c7a956 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
index 030229099be..f0ec520fa41 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
index 95fd2b9ada5..984f22d5d95 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
index b4269742a43..4c24da15ef1 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
index 693824c3b61..c5b1690a038 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
index eb38a354b26..6154792ff81 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
index b4269742a43..4c24da15ef1 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
index 1bc86c5f497..a3446d21fac 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
index 592f197b521..9065b56f5dd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
index 654ada76322..5accf22f798 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
index 2311df25b71..816f42d67e0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
index 7169cbef5a9..33c23248a43 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index 0a383f256c1..e0c2bef7b55 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 95b6966049b..9d41e48ebdf 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
index 46ad1a97cca..1529aa4bef0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
index a86a87c6494..6be8a2f6eb7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
index c0078d24f43..f13d90e8e70 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
index e015f52a7b1..29c576efe76 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
index dead4337e88..2a0088f5f8f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
index 0f18feb10e3..8324a171429 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index 0fab8bc1d3b..ee05418e97d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index cec3d86ddf5..b8d9b9b3a06 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
index 6ab15cdda99..fb5cb926455 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
index 28e5fe7e1ae..86baa499806 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
index 99713548b46..f2a0074c1e8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
index 10cfb5c70cd..3a60401f349 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
index c67158aed3a..32624452d6e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerC.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index 889a6659d3f..14b3c55232e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "ace/OS_NS_string.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
index 81758f935ce..d481b7803f5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 4bdf3fd51e1..44fd3a08df6 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerIORInterceptor.h"
#include <iostream>
char *
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
index 169e117664c..ff0110b1dd1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
#include "tao/IORInterceptor/IORInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
index 85546623723..65fba6b3d7e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
#include "ServerIORInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
index 1554e33cbe9..5dfa84b5172 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
index 4ccc5ddf3ab..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index 2945d4b3816..b8ee6b53248 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
index 1bd687a032f..4870f1877c3 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index 0e869a4ff00..c46cca7caf8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
index 15b0129df95..f3ec546e4b4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
index 4474bcc36f9..ceda3e3e52b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
index d5d6761f965..43a3b315995 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index 9aa625f79c1..ff6ef3abad8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
index 6c9f86ccd66..03cc0f9832b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
index 3408a7e5271..fc609c531c5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
index 4a2caec4654..0c2241c5312 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
index 3df2ac79841..b812a1851f3 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index 0fab8bc1d3b..ee05418e97d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index ce2a66ddb01..656d2383bce 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
index 4a68961eaa5..5bd7dd2a6d4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
index 99713548b46..f2a0074c1e8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
index b855692098c..d05c74f3366 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
index 86ab2829b18..286f2f4a491 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerC.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index e95806dcf84..cb156afba0d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/OS_NS_string.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
index 5fba8b25c10..24befa12b87 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
index 6096a11c6e9..3874ab18825 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
index bb113f93d2c..c7485411606 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
index 4ccc5ddf3ab..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
index 654ada76322..5accf22f798 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger.idl b/TAO/DevGuideExamples/RTCORBA/Messenger.idl
index e7cc8a268d0..0ca944bcc16 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger.idl
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
index e1df21b61ef..7d22f0a9bca 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "common.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
index b9abf1d1d26..b5142206447 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "common.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
index 2f66e7d7fd5..54a132d4978 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Thread.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc b/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
index 55ae18affc1..67dbfead978 100644
--- a/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
+++ b/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/RTCORBA/common.cpp b/TAO/DevGuideExamples/RTCORBA/common.cpp
index cece2ceefd9..4f5a17ce962 100644
--- a/TAO/DevGuideExamples/RTCORBA/common.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
CORBA::ULong
diff --git a/TAO/DevGuideExamples/RTCORBA/common.h b/TAO/DevGuideExamples/RTCORBA/common.h
index 4fb308cb437..a53bc0a7918 100644
--- a/TAO/DevGuideExamples/RTCORBA/common.h
+++ b/TAO/DevGuideExamples/RTCORBA/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_COMMON_H
#define MESSENGER_COMMON_H
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger.idl b/TAO/DevGuideExamples/SmartProxies/Logger.idl
index 3b144588056..e3e7c507324 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger.idl
+++ b/TAO/DevGuideExamples/SmartProxies/Logger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Logger.idl
interface Logger
diff --git a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
index 8d7c9627b2d..d5a3a137655 100644
--- a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// LoggerServer.cpp
#include "Logger_i.h"
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
index 88b4c38bf35..077bd43a8b2 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logger_i.h"
#include "ace/OS_NS_time.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
index 4a4c9c4e612..d23787a08e9 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LOGGERI_H_
#define LOGGERI_H_
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger.idl b/TAO/DevGuideExamples/SmartProxies/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger.idl
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp b/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
index add68848b60..722500386c6 100644
--- a/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "Smart_Messenger_Proxy.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
index 580e8ae123f..8229952427c 100644
--- a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc b/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
index 205a6bd1b4f..87c105c803a 100644
--- a/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
+++ b/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
// The server doesn't use Smart Proxies, but since the client
// shares the idl generated source files, it needs to have the
// -Gsp option added to the tao_idl flags.
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
index a3572439088..35a37beb085 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Smart_Messenger_Proxy.cpp
#include "Smart_Messenger_Proxy.h"
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
index 6183c4bd0b0..7ecceedf1a0 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Smart_Messenger_Proxy.h
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
index 4faf7a61ecc..e7b3cbd31cc 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "_pch.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl b/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
index 9a122a1695b..272243e953a 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Person {
public string name;
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
index ac5592f62d6..b8ea6f6f3ad 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Dev_Bank_idl): taoidldefaults, valuetype {
idlflags += -Wb,pch_include=_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
index 22345636352..aaa387072a7 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "bankC.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
index ca6f1e731a7..e4be0be6e82 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "bankS.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
index 40cfdd6bfbb..b5d4854dfb1 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Message_i.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
index 704482c22d8..f762e101cf1 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSAGE_I_H
#define MESSAGE_I_H
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
index 299965806d6..e6a63fc9278 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
// Modified to make use of ValueTypes
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
index 7f4da7efa74..1c310744b18 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Message_i.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
index 5cf051cb6c4..df2b58e8947 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
index 15a1dfed447..0ee9c784f67 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
index a12e478f95e..dcfd641fbf5 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
index 423ba67a264..1827d58c00d 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*DevGuideIDL): taoidldefaults, valuetype {
idlflags += -Wb,pch_include=_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
index 4faf7a61ecc..e7b3cbd31cc 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "_pch.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H