ChangeLogTag: Wed Jan 5 14:22:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

67 files changed, 70 insertions, 130 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fd6c0c8b34d..ccd87037fa6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Jan  5 14:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMI/FL_Callback/Progress_i.{h,cpp,i}:
+        * examples/AMI/FL_Callback/Peer_i.{h,cpp,i}:
+        * tests/FL_Cube/test_i/{h,cpp,i}:
+        * tests/Object_Loader/Loader.{h,cpp,i}:
+        * tests/Object_Loader/Test_i.{h,cpp,i}:
+        * tests/QtTests/test_i.{h,cpp,i}:
+        * tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i:
+        * tests/Timeout/test_i.{h,cpp,i}:
+        * tests/Xt_Stopwatch/test_i.{h,cpp,i}:
+        * orbsvcs/tests/EC_Throughput/ECT_Driver.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Supplier_T.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Peer_T.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Consumer_T.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/tests/EC_Throughput/Makefile.am:
+          Updated for changes above
+
 Wed Jan  5 13:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Valuetype/ValueFactory.{h,cpp,inl}:
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
index 0ef96274d9e..78f36853be0 100644
--- a/ace/RMCast/Makefile.am
+++ b/ace/RMCast/Makefile.am
@@ -16,7 +16,7 @@ ACE_ROOT = $(top_srcdir)
 
 nobase_include_HEADERS =
 lib_LTLIBRARIES =
-## Makefile.RMCast.am 
+## Makefile.RMCast.am
 
 if BUILD_RMCAST
 lib_LTLIBRARIES += libACE_RMCast.la
@@ -86,7 +86,6 @@ nobase_include_HEADERS += \
   RMCast_UDP_Reliable_Receiver.h \
   RMCast_UDP_Reliable_Sender.h \
   RMCast_Worker.h \
-  RMCast.i \
   RMCast_Ack_Worker.i \
   RMCast_Copy_On_Write.i \
   RMCast_Fork.i \
@@ -94,10 +93,8 @@ nobase_include_HEADERS += \
   RMCast_IO_UDP.i \
   RMCast_Membership.i \
   RMCast_Module.i \
-  RMCast_Module_Factory.i \
   RMCast_Partial_Message.i \
   RMCast_Proxy.i \
-  RMCast_Reassembly.i \
   RMCast_Receiver_Module.i \
   RMCast_Reliable_Factory.i \
   RMCast_Reordering.i \
@@ -109,8 +106,7 @@ nobase_include_HEADERS += \
   RMCast_UDP_Event_Handler.i \
   RMCast_UDP_Proxy.i \
   RMCast_UDP_Reliable_Receiver.i \
-  RMCast_UDP_Reliable_Sender.i \
-  RMCast_Worker.i
+  RMCast_UDP_Reliable_Sender.i
 
 pkgconfigdata_DATA = ACE_RMCast.pc
 
diff --git a/ace/RMCast/RMCast.cpp b/ace/RMCast/RMCast.cpp
index 92ea637e481..eb9887f8883 100644
--- a/ace/RMCast/RMCast.cpp
+++ b/ace/RMCast/RMCast.cpp
@@ -2,8 +2,4 @@
 
 #include "RMCast.h"
 
-#if !defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast, "$Id$")
+ACE_RCSID(RMCast, RMCast, "$Id$")
diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h
index aa6730f4b85..2339daa6f8e 100644
--- a/ace/RMCast/RMCast.h
+++ b/ace/RMCast/RMCast.h
@@ -249,9 +249,5 @@ public:
   };
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_H */
diff --git a/ace/RMCast/RMCast.i b/ace/RMCast/RMCast.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast_Ack_Worker.cpp b/ace/RMCast/RMCast_Ack_Worker.cpp
index d9843ebe93b..d454e013056 100644
--- a/ace/RMCast/RMCast_Ack_Worker.cpp
+++ b/ace/RMCast/RMCast_Ack_Worker.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Ack_Worker.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$")
+ACE_RCSID(RMCast, RMCast_Ack_Worker, "$Id$")
 
 int
 ACE_RMCast_Ack_Worker::work (ACE_UINT32 const & key,
diff --git a/ace/RMCast/RMCast_Fork.cpp b/ace/RMCast/RMCast_Fork.cpp
index 928d34cb411..92c81b9d33e 100644
--- a/ace/RMCast/RMCast_Fork.cpp
+++ b/ace/RMCast/RMCast_Fork.cpp
@@ -6,7 +6,7 @@
 # include "RMCast_Fork.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Fork, "$Id$")
+ACE_RCSID(RMCast, RMCast_Fork, "$Id$")
 
 ACE_RMCast_Fork::~ACE_RMCast_Fork (void)
 {
diff --git a/ace/RMCast/RMCast_Fragment.cpp b/ace/RMCast/RMCast_Fragment.cpp
index 2285fcb0a49..a278b0083c6 100644
--- a/ace/RMCast/RMCast_Fragment.cpp
+++ b/ace/RMCast/RMCast_Fragment.cpp
@@ -11,7 +11,7 @@
 #include "RMCast_Fragment.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Fragment, "$Id$")
+ACE_RCSID(RMCast, RMCast_Fragment, "$Id$")
 
 ACE_RMCast_Fragment::
 ACE_RMCast_Fragment (void)
diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp
index 156a60c7ad3..d0648e0e40d 100644
--- a/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/ace/RMCast/RMCast_IO_UDP.cpp
@@ -17,7 +17,7 @@
 #include "ace/os_include/arpa/os_inet.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
+ACE_RCSID(RMCast, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
 
 ACE_RMCast_IO_UDP::~ACE_RMCast_IO_UDP (void)
 {
diff --git a/ace/RMCast/RMCast_Membership.cpp b/ace/RMCast/RMCast_Membership.cpp
index 598e05019af..7511c72f7fe 100644
--- a/ace/RMCast/RMCast_Membership.cpp
+++ b/ace/RMCast/RMCast_Membership.cpp
@@ -11,7 +11,7 @@
 #include "RMCast_Proxy.h"
 #include "ace/Guard_T.h"
 
-ACE_RCSID(ace, RMCast_Membership, "$Id$")
+ACE_RCSID(RMCast, RMCast_Membership, "$Id$")
 
 ACE_RMCast_Membership::~ACE_RMCast_Membership (void)
 {
diff --git a/ace/RMCast/RMCast_Module.cpp b/ace/RMCast/RMCast_Module.cpp
index 727ef631d9d..d2b954ee03b 100644
--- a/ace/RMCast/RMCast_Module.cpp
+++ b/ace/RMCast/RMCast_Module.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_Module.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Module, "$Id$")
+ACE_RCSID(RMCast, RMCast_Module, "$Id$")
 
 ACE_RMCast_Module::~ACE_RMCast_Module (void)
 {
diff --git a/ace/RMCast/RMCast_Module_Factory.cpp b/ace/RMCast/RMCast_Module_Factory.cpp
index b749048a78c..a693c0f0bf5 100644
--- a/ace/RMCast/RMCast_Module_Factory.cpp
+++ b/ace/RMCast/RMCast_Module_Factory.cpp
@@ -2,11 +2,7 @@
 
 #include "RMCast_Module_Factory.h"
 
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Module_Factory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Module_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Module_Factory, "$Id$")
 
 ACE_RMCast_Module_Factory::~ACE_RMCast_Module_Factory (void)
 {
diff --git a/ace/RMCast/RMCast_Module_Factory.h b/ace/RMCast/RMCast_Module_Factory.h
index 53efdb4355f..eada18f8aca 100644
--- a/ace/RMCast/RMCast_Module_Factory.h
+++ b/ace/RMCast/RMCast_Module_Factory.h
@@ -63,9 +63,5 @@ public:
   virtual void destroy (ACE_RMCast_Module *) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Module_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_MODULE_FACTORY_H */
diff --git a/ace/RMCast/RMCast_Module_Factory.i b/ace/RMCast/RMCast_Module_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Module_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast_Partial_Message.cpp b/ace/RMCast/RMCast_Partial_Message.cpp
index d6e5cff0f7b..45718e2ce45 100644
--- a/ace/RMCast/RMCast_Partial_Message.cpp
+++ b/ace/RMCast/RMCast_Partial_Message.cpp
@@ -7,7 +7,7 @@
 #include "RMCast_Partial_Message.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Partial_Message, "$Id$")
+ACE_RCSID(RMCast, RMCast_Partial_Message, "$Id$")
 
 ACE_RMCast_Partial_Message::
 ACE_RMCast_Partial_Message (ACE_UINT32 message_size)
diff --git a/ace/RMCast/RMCast_Proxy.cpp b/ace/RMCast/RMCast_Proxy.cpp
index 2257f9a2bd7..6aa870ea702 100644
--- a/ace/RMCast/RMCast_Proxy.cpp
+++ b/ace/RMCast/RMCast_Proxy.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_Proxy.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Proxy, "$Id$")
+ACE_RCSID(RMCast, RMCast_Proxy, "$Id$")
 
 ACE_RMCast_Proxy::~ACE_RMCast_Proxy (void)
 {
diff --git a/ace/RMCast/RMCast_Reassembly.cpp b/ace/RMCast/RMCast_Reassembly.cpp
index e16fb368acf..6da9f865697 100644
--- a/ace/RMCast/RMCast_Reassembly.cpp
+++ b/ace/RMCast/RMCast_Reassembly.cpp
@@ -8,11 +8,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Reassembly, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reassembly, "$Id$")
 
 ACE_RMCast_Reassembly::
 ACE_RMCast_Reassembly (void)
diff --git a/ace/RMCast/RMCast_Reassembly.h b/ace/RMCast/RMCast_Reassembly.h
index d4ed999cf78..f6fc8989719 100644
--- a/ace/RMCast/RMCast_Reassembly.h
+++ b/ace/RMCast/RMCast_Reassembly.h
@@ -67,9 +67,5 @@ private:
   Message_Map messages_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_REASSEMBLY_H */
diff --git a/ace/RMCast/RMCast_Reassembly.i b/ace/RMCast/RMCast_Reassembly.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Reassembly.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast_Receiver_Module.cpp b/ace/RMCast/RMCast_Receiver_Module.cpp
index 2d08ca4bb02..05e6ceb8c7f 100644
--- a/ace/RMCast/RMCast_Receiver_Module.cpp
+++ b/ace/RMCast/RMCast_Receiver_Module.cpp
@@ -10,7 +10,7 @@
 # include "RMCast_Receiver_Module.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$")
+ACE_RCSID(RMCast, RMCast_Receiver_Module, "$Id$")
 
 ACE_RMCast_Receiver_Module::~ACE_RMCast_Receiver_Module (void)
 {
diff --git a/ace/RMCast/RMCast_Reliable_Factory.cpp b/ace/RMCast/RMCast_Reliable_Factory.cpp
index 6140c685153..b471af89c3d 100644
--- a/ace/RMCast/RMCast_Reliable_Factory.cpp
+++ b/ace/RMCast/RMCast_Reliable_Factory.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Reliable_Factory.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reliable_Factory, "$Id$")
 
 ACE_RMCast_Reliable_Factory::~ACE_RMCast_Reliable_Factory (void)
 {
diff --git a/ace/RMCast/RMCast_Reordering.cpp b/ace/RMCast/RMCast_Reordering.cpp
index 755fa5c4a86..1aebf27d8ee 100644
--- a/ace/RMCast/RMCast_Reordering.cpp
+++ b/ace/RMCast/RMCast_Reordering.cpp
@@ -11,7 +11,7 @@
 # include "RMCast_Reordering.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Reordering, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reordering, "$Id$")
 
 ACE_RMCast_Reordering::~ACE_RMCast_Reordering (void)
 {
diff --git a/ace/RMCast/RMCast_Resend_Handler.cpp b/ace/RMCast/RMCast_Resend_Handler.cpp
index c8597b301f0..4bb5d717742 100644
--- a/ace/RMCast/RMCast_Resend_Handler.cpp
+++ b/ace/RMCast/RMCast_Resend_Handler.cpp
@@ -7,7 +7,7 @@
 # include "RMCast_Resend_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$")
+ACE_RCSID(RMCast, RMCast_Resend_Handler, "$Id$")
 
 ACE_RMCast_Resend_Handler::~ACE_RMCast_Resend_Handler (void)
 {
diff --git a/ace/RMCast/RMCast_Resend_Worker.cpp b/ace/RMCast/RMCast_Resend_Worker.cpp
index a4acbeff0cd..77f41aee1fb 100644
--- a/ace/RMCast/RMCast_Resend_Worker.cpp
+++ b/ace/RMCast/RMCast_Resend_Worker.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Resend_Worker.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$")
+ACE_RCSID(RMCast, RMCast_Resend_Worker, "$Id$")
 
 int
 ACE_RMCast_Resend_Worker::work (ACE_UINT32 const & key,
diff --git a/ace/RMCast/RMCast_Retransmission.cpp b/ace/RMCast/RMCast_Retransmission.cpp
index d3c8ee97d84..c6f03626e39 100644
--- a/ace/RMCast/RMCast_Retransmission.cpp
+++ b/ace/RMCast/RMCast_Retransmission.cpp
@@ -12,7 +12,7 @@
 # include "RMCast_Retransmission.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Retransmission, "$Id$")
+ACE_RCSID(RMCast, RMCast_Retransmission, "$Id$")
 
 ACE_RMCast_Retransmission::~ACE_RMCast_Retransmission (void)
 {
diff --git a/ace/RMCast/RMCast_Sequencer.cpp b/ace/RMCast/RMCast_Sequencer.cpp
index 356fbb4a01b..7ee857ca762 100644
--- a/ace/RMCast/RMCast_Sequencer.cpp
+++ b/ace/RMCast/RMCast_Sequencer.cpp
@@ -10,7 +10,7 @@
 
 #include "ace/Guard_T.h"
 
-ACE_RCSID(ace, RMCast_Sequencer, "$Id$")
+ACE_RCSID(RMCast, RMCast_Sequencer, "$Id$")
 
 ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void)
 {
diff --git a/ace/RMCast/RMCast_Singleton_Factory.cpp b/ace/RMCast/RMCast_Singleton_Factory.cpp
index 403b87060e2..5e5bd9f0930 100644
--- a/ace/RMCast/RMCast_Singleton_Factory.cpp
+++ b/ace/RMCast/RMCast_Singleton_Factory.cpp
@@ -6,7 +6,7 @@
 # include "RMCast_Singleton_Factory.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Singleton_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Singleton_Factory, "$Id$")
 
 ACE_RMCast_Singleton_Factory::~ACE_RMCast_Singleton_Factory (void)
 {
diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/ace/RMCast/RMCast_UDP_Event_Handler.cpp
index 963928845f7..6f7ae18f19e 100644
--- a/ace/RMCast/RMCast_UDP_Event_Handler.cpp
+++ b/ace/RMCast/RMCast_UDP_Event_Handler.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_UDP_Event_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Event_Handler, "$Id$")
 
 ACE_RMCast_UDP_Event_Handler::~ACE_RMCast_UDP_Event_Handler (void)
 {
diff --git a/ace/RMCast/RMCast_UDP_Proxy.cpp b/ace/RMCast/RMCast_UDP_Proxy.cpp
index 7801a3f2ce3..cb669397756 100644
--- a/ace/RMCast/RMCast_UDP_Proxy.cpp
+++ b/ace/RMCast/RMCast_UDP_Proxy.cpp
@@ -13,7 +13,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Proxy, "$Id$")
 
 ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp,
                                             const ACE_INET_Addr &addr)
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
index 9057281cc52..8c41e9bb663 100644
--- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
+++ b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_UDP_Reliable_Receiver.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Reliable_Receiver, "$Id$")
 
 ACE_RMCast_UDP_Reliable_Receiver::ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_module)
   : user_factory_ (user_module)
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
index befab142320..641fb3403ac 100644
--- a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
+++ b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_UDP_Reliable_Sender.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Reliable_Sender, "$Id$")
 
 ACE_RMCast_UDP_Reliable_Sender::ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control)
   : user_control_ (user_control)
diff --git a/ace/RMCast/RMCast_Worker.cpp b/ace/RMCast/RMCast_Worker.cpp
index 06254b8c0f6..6f24892eace 100644
--- a/ace/RMCast/RMCast_Worker.cpp
+++ b/ace/RMCast/RMCast_Worker.cpp
@@ -5,10 +5,6 @@
 
 #include "RMCast_Worker.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RMCast, RMCast_Worker, "$Id$")
 
 template<class KEY, class ITEM>
diff --git a/ace/RMCast/RMCast_Worker.h b/ace/RMCast/RMCast_Worker.h
index d3eb3032ebc..6431b192904 100644
--- a/ace/RMCast/RMCast_Worker.h
+++ b/ace/RMCast/RMCast_Worker.h
@@ -21,10 +21,6 @@ public:
                     ITEM const & item) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "RMCast_Worker.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/RMCast/RMCast_Worker.i b/ace/RMCast/RMCast_Worker.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Worker.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index 0ef96274d9e..78f36853be0 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -16,7 +16,7 @@ ACE_ROOT = $(top_srcdir)
 
 nobase_include_HEADERS =
 lib_LTLIBRARIES =
-## Makefile.RMCast.am 
+## Makefile.RMCast.am
 
 if BUILD_RMCAST
 lib_LTLIBRARIES += libACE_RMCast.la
@@ -86,7 +86,6 @@ nobase_include_HEADERS += \
   RMCast_UDP_Reliable_Receiver.h \
   RMCast_UDP_Reliable_Sender.h \
   RMCast_Worker.h \
-  RMCast.i \
   RMCast_Ack_Worker.i \
   RMCast_Copy_On_Write.i \
   RMCast_Fork.i \
@@ -94,10 +93,8 @@ nobase_include_HEADERS += \
   RMCast_IO_UDP.i \
   RMCast_Membership.i \
   RMCast_Module.i \
-  RMCast_Module_Factory.i \
   RMCast_Partial_Message.i \
   RMCast_Proxy.i \
-  RMCast_Reassembly.i \
   RMCast_Receiver_Module.i \
   RMCast_Reliable_Factory.i \
   RMCast_Reordering.i \
@@ -109,8 +106,7 @@ nobase_include_HEADERS += \
   RMCast_UDP_Event_Handler.i \
   RMCast_UDP_Proxy.i \
   RMCast_UDP_Reliable_Receiver.i \
-  RMCast_UDP_Reliable_Sender.i \
-  RMCast_Worker.i
+  RMCast_UDP_Reliable_Sender.i
 
 pkgconfigdata_DATA = ACE_RMCast.pc
 
diff --git a/protocols/ace/RMCast/RMCast.cpp b/protocols/ace/RMCast/RMCast.cpp
index 92ea637e481..eb9887f8883 100644
--- a/protocols/ace/RMCast/RMCast.cpp
+++ b/protocols/ace/RMCast/RMCast.cpp
@@ -2,8 +2,4 @@
 
 #include "RMCast.h"
 
-#if !defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast, "$Id$")
+ACE_RCSID(RMCast, RMCast, "$Id$")
diff --git a/protocols/ace/RMCast/RMCast.h b/protocols/ace/RMCast/RMCast.h
index aa6730f4b85..2339daa6f8e 100644
--- a/protocols/ace/RMCast/RMCast.h
+++ b/protocols/ace/RMCast/RMCast.h
@@ -249,9 +249,5 @@ public:
   };
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_H */
diff --git a/protocols/ace/RMCast/RMCast.i b/protocols/ace/RMCast/RMCast.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/protocols/ace/RMCast/RMCast.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/protocols/ace/RMCast/RMCast_Ack_Worker.cpp b/protocols/ace/RMCast/RMCast_Ack_Worker.cpp
index d9843ebe93b..d454e013056 100644
--- a/protocols/ace/RMCast/RMCast_Ack_Worker.cpp
+++ b/protocols/ace/RMCast/RMCast_Ack_Worker.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Ack_Worker.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$")
+ACE_RCSID(RMCast, RMCast_Ack_Worker, "$Id$")
 
 int
 ACE_RMCast_Ack_Worker::work (ACE_UINT32 const & key,
diff --git a/protocols/ace/RMCast/RMCast_Fork.cpp b/protocols/ace/RMCast/RMCast_Fork.cpp
index 928d34cb411..92c81b9d33e 100644
--- a/protocols/ace/RMCast/RMCast_Fork.cpp
+++ b/protocols/ace/RMCast/RMCast_Fork.cpp
@@ -6,7 +6,7 @@
 # include "RMCast_Fork.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Fork, "$Id$")
+ACE_RCSID(RMCast, RMCast_Fork, "$Id$")
 
 ACE_RMCast_Fork::~ACE_RMCast_Fork (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Fragment.cpp b/protocols/ace/RMCast/RMCast_Fragment.cpp
index 2285fcb0a49..a278b0083c6 100644
--- a/protocols/ace/RMCast/RMCast_Fragment.cpp
+++ b/protocols/ace/RMCast/RMCast_Fragment.cpp
@@ -11,7 +11,7 @@
 #include "RMCast_Fragment.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Fragment, "$Id$")
+ACE_RCSID(RMCast, RMCast_Fragment, "$Id$")
 
 ACE_RMCast_Fragment::
 ACE_RMCast_Fragment (void)
diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
index 156a60c7ad3..d0648e0e40d 100644
--- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
@@ -17,7 +17,7 @@
 #include "ace/os_include/arpa/os_inet.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
+ACE_RCSID(RMCast, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
 
 ACE_RMCast_IO_UDP::~ACE_RMCast_IO_UDP (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Membership.cpp b/protocols/ace/RMCast/RMCast_Membership.cpp
index 598e05019af..7511c72f7fe 100644
--- a/protocols/ace/RMCast/RMCast_Membership.cpp
+++ b/protocols/ace/RMCast/RMCast_Membership.cpp
@@ -11,7 +11,7 @@
 #include "RMCast_Proxy.h"
 #include "ace/Guard_T.h"
 
-ACE_RCSID(ace, RMCast_Membership, "$Id$")
+ACE_RCSID(RMCast, RMCast_Membership, "$Id$")
 
 ACE_RMCast_Membership::~ACE_RMCast_Membership (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Module.cpp b/protocols/ace/RMCast/RMCast_Module.cpp
index 727ef631d9d..d2b954ee03b 100644
--- a/protocols/ace/RMCast/RMCast_Module.cpp
+++ b/protocols/ace/RMCast/RMCast_Module.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_Module.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Module, "$Id$")
+ACE_RCSID(RMCast, RMCast_Module, "$Id$")
 
 ACE_RMCast_Module::~ACE_RMCast_Module (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Module_Factory.cpp b/protocols/ace/RMCast/RMCast_Module_Factory.cpp
index b749048a78c..a693c0f0bf5 100644
--- a/protocols/ace/RMCast/RMCast_Module_Factory.cpp
+++ b/protocols/ace/RMCast/RMCast_Module_Factory.cpp
@@ -2,11 +2,7 @@
 
 #include "RMCast_Module_Factory.h"
 
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Module_Factory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Module_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Module_Factory, "$Id$")
 
 ACE_RMCast_Module_Factory::~ACE_RMCast_Module_Factory (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Module_Factory.h b/protocols/ace/RMCast/RMCast_Module_Factory.h
index 53efdb4355f..eada18f8aca 100644
--- a/protocols/ace/RMCast/RMCast_Module_Factory.h
+++ b/protocols/ace/RMCast/RMCast_Module_Factory.h
@@ -63,9 +63,5 @@ public:
   virtual void destroy (ACE_RMCast_Module *) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Module_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_MODULE_FACTORY_H */
diff --git a/protocols/ace/RMCast/RMCast_Module_Factory.i b/protocols/ace/RMCast/RMCast_Module_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/protocols/ace/RMCast/RMCast_Module_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/protocols/ace/RMCast/RMCast_Partial_Message.cpp b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
index d6e5cff0f7b..45718e2ce45 100644
--- a/protocols/ace/RMCast/RMCast_Partial_Message.cpp
+++ b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
@@ -7,7 +7,7 @@
 #include "RMCast_Partial_Message.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Partial_Message, "$Id$")
+ACE_RCSID(RMCast, RMCast_Partial_Message, "$Id$")
 
 ACE_RMCast_Partial_Message::
 ACE_RMCast_Partial_Message (ACE_UINT32 message_size)
diff --git a/protocols/ace/RMCast/RMCast_Proxy.cpp b/protocols/ace/RMCast/RMCast_Proxy.cpp
index 2257f9a2bd7..6aa870ea702 100644
--- a/protocols/ace/RMCast/RMCast_Proxy.cpp
+++ b/protocols/ace/RMCast/RMCast_Proxy.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_Proxy.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Proxy, "$Id$")
+ACE_RCSID(RMCast, RMCast_Proxy, "$Id$")
 
 ACE_RMCast_Proxy::~ACE_RMCast_Proxy (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.cpp b/protocols/ace/RMCast/RMCast_Reassembly.cpp
index e16fb368acf..6da9f865697 100644
--- a/protocols/ace/RMCast/RMCast_Reassembly.cpp
+++ b/protocols/ace/RMCast/RMCast_Reassembly.cpp
@@ -8,11 +8,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Reassembly, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reassembly, "$Id$")
 
 ACE_RMCast_Reassembly::
 ACE_RMCast_Reassembly (void)
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.h b/protocols/ace/RMCast/RMCast_Reassembly.h
index d4ed999cf78..f6fc8989719 100644
--- a/protocols/ace/RMCast/RMCast_Reassembly.h
+++ b/protocols/ace/RMCast/RMCast_Reassembly.h
@@ -67,9 +67,5 @@ private:
   Message_Map messages_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RMCAST_REASSEMBLY_H */
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.i b/protocols/ace/RMCast/RMCast_Reassembly.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/protocols/ace/RMCast/RMCast_Reassembly.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/protocols/ace/RMCast/RMCast_Receiver_Module.cpp b/protocols/ace/RMCast/RMCast_Receiver_Module.cpp
index 2d08ca4bb02..05e6ceb8c7f 100644
--- a/protocols/ace/RMCast/RMCast_Receiver_Module.cpp
+++ b/protocols/ace/RMCast/RMCast_Receiver_Module.cpp
@@ -10,7 +10,7 @@
 # include "RMCast_Receiver_Module.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$")
+ACE_RCSID(RMCast, RMCast_Receiver_Module, "$Id$")
 
 ACE_RMCast_Receiver_Module::~ACE_RMCast_Receiver_Module (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp b/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp
index 6140c685153..b471af89c3d 100644
--- a/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp
+++ b/protocols/ace/RMCast/RMCast_Reliable_Factory.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Reliable_Factory.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reliable_Factory, "$Id$")
 
 ACE_RMCast_Reliable_Factory::~ACE_RMCast_Reliable_Factory (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Reordering.cpp b/protocols/ace/RMCast/RMCast_Reordering.cpp
index 755fa5c4a86..1aebf27d8ee 100644
--- a/protocols/ace/RMCast/RMCast_Reordering.cpp
+++ b/protocols/ace/RMCast/RMCast_Reordering.cpp
@@ -11,7 +11,7 @@
 # include "RMCast_Reordering.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Reordering, "$Id$")
+ACE_RCSID(RMCast, RMCast_Reordering, "$Id$")
 
 ACE_RMCast_Reordering::~ACE_RMCast_Reordering (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Resend_Handler.cpp b/protocols/ace/RMCast/RMCast_Resend_Handler.cpp
index c8597b301f0..4bb5d717742 100644
--- a/protocols/ace/RMCast/RMCast_Resend_Handler.cpp
+++ b/protocols/ace/RMCast/RMCast_Resend_Handler.cpp
@@ -7,7 +7,7 @@
 # include "RMCast_Resend_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$")
+ACE_RCSID(RMCast, RMCast_Resend_Handler, "$Id$")
 
 ACE_RMCast_Resend_Handler::~ACE_RMCast_Resend_Handler (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Resend_Worker.cpp b/protocols/ace/RMCast/RMCast_Resend_Worker.cpp
index a4acbeff0cd..77f41aee1fb 100644
--- a/protocols/ace/RMCast/RMCast_Resend_Worker.cpp
+++ b/protocols/ace/RMCast/RMCast_Resend_Worker.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_Resend_Worker.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$")
+ACE_RCSID(RMCast, RMCast_Resend_Worker, "$Id$")
 
 int
 ACE_RMCast_Resend_Worker::work (ACE_UINT32 const & key,
diff --git a/protocols/ace/RMCast/RMCast_Retransmission.cpp b/protocols/ace/RMCast/RMCast_Retransmission.cpp
index d3c8ee97d84..c6f03626e39 100644
--- a/protocols/ace/RMCast/RMCast_Retransmission.cpp
+++ b/protocols/ace/RMCast/RMCast_Retransmission.cpp
@@ -12,7 +12,7 @@
 # include "RMCast_Retransmission.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Retransmission, "$Id$")
+ACE_RCSID(RMCast, RMCast_Retransmission, "$Id$")
 
 ACE_RMCast_Retransmission::~ACE_RMCast_Retransmission (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Sequencer.cpp b/protocols/ace/RMCast/RMCast_Sequencer.cpp
index 356fbb4a01b..7ee857ca762 100644
--- a/protocols/ace/RMCast/RMCast_Sequencer.cpp
+++ b/protocols/ace/RMCast/RMCast_Sequencer.cpp
@@ -10,7 +10,7 @@
 
 #include "ace/Guard_T.h"
 
-ACE_RCSID(ace, RMCast_Sequencer, "$Id$")
+ACE_RCSID(RMCast, RMCast_Sequencer, "$Id$")
 
 ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_Singleton_Factory.cpp b/protocols/ace/RMCast/RMCast_Singleton_Factory.cpp
index 403b87060e2..5e5bd9f0930 100644
--- a/protocols/ace/RMCast/RMCast_Singleton_Factory.cpp
+++ b/protocols/ace/RMCast/RMCast_Singleton_Factory.cpp
@@ -6,7 +6,7 @@
 # include "RMCast_Singleton_Factory.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_Singleton_Factory, "$Id$")
+ACE_RCSID(RMCast, RMCast_Singleton_Factory, "$Id$")
 
 ACE_RMCast_Singleton_Factory::~ACE_RMCast_Singleton_Factory (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp
index 963928845f7..6f7ae18f19e 100644
--- a/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp
+++ b/protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_UDP_Event_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Event_Handler, "$Id$")
 
 ACE_RMCast_UDP_Event_Handler::~ACE_RMCast_UDP_Event_Handler (void)
 {
diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
index 7801a3f2ce3..cb669397756 100644
--- a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
+++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp
@@ -13,7 +13,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Proxy, "$Id$")
 
 ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp,
                                             const ACE_INET_Addr &addr)
diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
index 9057281cc52..8c41e9bb663 100644
--- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
+++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
@@ -8,7 +8,7 @@
 # include "RMCast_UDP_Reliable_Receiver.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Reliable_Receiver, "$Id$")
 
 ACE_RMCast_UDP_Reliable_Receiver::ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_module)
   : user_factory_ (user_module)
diff --git a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
index befab142320..641fb3403ac 100644
--- a/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
+++ b/protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
@@ -9,7 +9,7 @@
 # include "RMCast_UDP_Reliable_Sender.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$")
+ACE_RCSID(RMCast, RMCast_UDP_Reliable_Sender, "$Id$")
 
 ACE_RMCast_UDP_Reliable_Sender::ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control)
   : user_control_ (user_control)
diff --git a/protocols/ace/RMCast/RMCast_Worker.cpp b/protocols/ace/RMCast/RMCast_Worker.cpp
index 06254b8c0f6..6f24892eace 100644
--- a/protocols/ace/RMCast/RMCast_Worker.cpp
+++ b/protocols/ace/RMCast/RMCast_Worker.cpp
@@ -5,10 +5,6 @@
 
 #include "RMCast_Worker.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RMCast, RMCast_Worker, "$Id$")
 
 template<class KEY, class ITEM>
diff --git a/protocols/ace/RMCast/RMCast_Worker.h b/protocols/ace/RMCast/RMCast_Worker.h
index d3eb3032ebc..6431b192904 100644
--- a/protocols/ace/RMCast/RMCast_Worker.h
+++ b/protocols/ace/RMCast/RMCast_Worker.h
@@ -21,10 +21,6 @@ public:
                     ITEM const & item) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "RMCast_Worker.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/protocols/ace/RMCast/RMCast_Worker.i b/protocols/ace/RMCast/RMCast_Worker.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/protocols/ace/RMCast/RMCast_Worker.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$