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

104 files changed, 59 insertions, 404 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index da95ab8589e..505fdd77562 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,44 @@
+Wed Jan  5 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Null_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_SupplierControl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/Local_ESTypes.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
 Wed Jan  5 10:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/RTPortableServer/RT_Acceptor_Filters.{h,cpp,i}:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
index 1ef43a497d1..86b0590e956 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
@@ -2,11 +2,3 @@
 
 #include "ECG_Address_Server_Base.h"
 
-#if !defined(__ACE_INLINE__)
-#include "ECG_Address_Server_Base.i"
-#endif /* __ACE_INLINE__ */
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 533e6ba7391..97f2cf073c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -35,10 +35,5 @@ public:
   virtual int init (const char *arg) = 0;
 };
 
-
-#if defined(__ACE_INLINE__)
-#include "ECG_Address_Server_Base.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_ADDRESS_SERVER_BASE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index 1b54d487935..c08698cff1e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -2,10 +2,6 @@
 
 #include "ECG_ConsumerEC_Control.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "ECG_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
 
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
@@ -41,8 +37,3 @@ TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *,
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index fb768d8c3a9..62829a96c20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -73,10 +73,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECG_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_ConsumerEC_Control_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 7ff87f3f5b6..ac9c1e18bfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -7,10 +7,6 @@
 
 #include "ace/Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ECG_Reactive_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$")
 
 TAO_ECG_Reactive_ConsumerEC_Control::
@@ -246,8 +242,3 @@ TAO_ECG_Reactive_ConsumerEC_Control_Adapter::handle_timeout (
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index 5f7a01f5346..387b2e9dcfc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -119,10 +119,6 @@ private:
   ACE_Reactor *reactor_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECG_Reactive_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_REACTIVE_CONSUMEREC_CONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index 278ffbbfc42..ae4c0aa8e57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -5,10 +5,6 @@
 #include "ace/Reactor.h"
 #include "ace/os_include/os_fcntl.h"
 
-#if !defined(__ACE_INLINE__)
-#include "ECG_Simple_Mcast_EH.i"
-#endif /* __ACE_INLINE__ */
-
 TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv)
   : receiver_ (recv)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index ca830cc49c6..e2922882f3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -86,9 +86,5 @@ private:
   TAO_ECG_Dgram_Handler* receiver_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "ECG_Simple_Mcast_EH.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_SIMPLE_Mcast_EH_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index fb5333fb463..d3d8eb90a5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_And_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_And_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_And_Filter, "$Id$")
 
 TAO_EC_And_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 9c5f47f99c3..cdf21b9d9fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -82,9 +82,5 @@ private:
   size_t n_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_And_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_AND_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 7eb7b9fac4f..1538ebd5264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -20,12 +20,8 @@
 
 #include "tao/ORB_Core.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Basic_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_Basic_Factory, 
+ACE_RCSID (Event,
+           EC_Basic_Factory,
            "$Id$")
 
 TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index eb94087485b..8ba827cf306 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -110,10 +110,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Basic_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_BASIC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index da2d0e66069..c9ec83bc658 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Bitmask_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Bitmask_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
 
 TAO_EC_Bitmask_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 2842f163cbb..f999bb1d34f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -100,9 +100,5 @@ private:
   TAO_EC_Filter* child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Bitmask_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_BITMASK_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index a18ada6b040..67d42f4d31a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Conjunction_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Conjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
 
 const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index 67353ac488a..f1f3a95f60f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -106,9 +106,5 @@ private:
   ChildrenIterator current_child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Conjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_CONJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index d27e7203e8a..9c8edb3bdec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -8,12 +8,8 @@
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_ConsumerAdmin.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_ConsumerAdmin, 
+ACE_RCSID (Event,
+           EC_ConsumerAdmin,
            "$Id$")
 
 TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 60b5edadb24..df1d376da28 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -72,10 +72,6 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_ConsumerAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 0d0a8be8ed3..f0240c4a97a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_ConsumerControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "EC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
 
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 81fc7ea94c5..2ea9b266e35 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -71,10 +71,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index 8a02369cdf4..ab836a8dcbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -6,12 +6,7 @@
 #include "EC_Supplier_Filter.h"
 #include "ace/Synch_T.h"
 
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Default_ProxyConsumer.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Dd$")
+ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 853b7e04a93..58cd1d5d2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -75,10 +75,6 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Default_ProxyConsumer.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index e6f67b0085d..1265d53d656 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -6,10 +6,6 @@
 
 #include "ace/Reverse_Lock_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Default_ProxySupplier.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Event,
            EC_ProxySupplier,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index dfbe23bfd05..20685888574 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -72,10 +72,6 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Default_ProxySupplier.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 11e71c4b0ec..918859c6098 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Disjunction_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Disjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
 
 TAO_EC_Disjunction_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index d98ca3d312d..18f756efe73 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -83,9 +83,5 @@ private:
   size_t n_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Disjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_DISJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index c39e6ce5fbf..a38dcbbdce7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_Dispatching.h"
 #include "EC_ProxySupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Dispatching, "$Id$")
 
 TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 54ea96405e4..d61d5039829 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -74,10 +74,6 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index e15f04e497d..fa498a4d514 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -4,10 +4,6 @@
 #include "EC_Default_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Event_Channel, "$Id$")
 
 TAO_EC_Event_Channel::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index e0737db1c56..20ac3add3ba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -52,10 +52,6 @@ public:
                         int own_factory = 0);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1c141711388..015d6b83a17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -3,10 +3,6 @@
 #include "EC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Factory, "$Id$")
 
 TAO_EC_Factory::~TAO_EC_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index f70a4e08ad7..c042c8f4150 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -156,10 +156,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index c19e079d950..03e5d7011dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -4,10 +4,6 @@
 #include "EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$")
 
 TAO_EC_Kokyu_Filter::
@@ -154,7 +150,7 @@ TAO_EC_Kokyu_Filter::can_match (const RtecEventComm::EventHeader& header) const
   return this->body_->can_match (header);
 }
 
-/* 
+/*
     Kokyu_Filter
         |
         |body
@@ -171,7 +167,7 @@ TAO_EC_Kokyu_Filter::can_match (const RtecEventComm::EventHeader& header) const
 
 The entire hierarchy will have the same rt_info as the root. Only the root
 rt_info will be part of the dependency graph in the scheduler. The root
-rt_info will have a dependency on the consumer rt_info. 
+rt_info will have a dependency on the consumer rt_info.
 
 <--- shows dependency (oneway)
 
@@ -192,7 +188,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ACE_CHECK_RETURN (0);
 
 #ifdef EC_KOKYU_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "this->rt_info_ = %d, header.type = %d, qos_info.rt_info = %d\n",
               this->rt_info_, header.type, qos_info.rt_info));
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 55d64cdb2c9..a737b93cb55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -85,7 +85,7 @@ public:
                                 ACE_ENV_ARG_DECL);
   virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
                              ACE_ENV_ARG_DECL);
-  
+
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter
                               (const TAO_EC_Kokyu_Filter&))
@@ -125,9 +125,5 @@ private:
   RtecScheduler::Info_Type_t info_type_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_KOKYU_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index acf12ef62d9..5be3be22db3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_MT_Dispatching.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
 
 TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index ff92d8c16f7..989bb21caf8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -85,9 +85,5 @@ private:
   int active_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 5b9cf65242b..6e6e6a0fde6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Masked_Type_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Masked_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$")
 
 TAO_EC_Masked_Type_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 22f8b41e94c..14a8392d558 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -86,9 +86,5 @@ private:
   CORBA::ULong type_value_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Masked_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MASKED_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 6c71dd03171..7b59fce7388 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Negation_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Negation_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
 
 TAO_EC_Negation_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index b63e3fc8a49..dc6619fcd94 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -79,9 +79,5 @@ private:
   TAO_EC_Filter* child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Negation_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NEGATION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index e9df4b4298e..9414cb975d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -19,10 +19,6 @@
 
 #include "tao/ORB_Core.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Null_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
@@ -240,8 +236,3 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 9ce13b08d49..4214c4ddc83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -107,9 +107,5 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Null_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NULL_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 53f7634ce00..2942b19527f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,10 +10,6 @@
 
 #include "ace/Sched_Params.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
 
 TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 717fad35865..68e7f4b927b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -81,9 +81,5 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_PRIORITY_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 05d44206f14..3de61363002 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_RTCORBA_Dispatching.h"
 #include "tao/RTCORBA/Priority_Mapping.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Dispatching.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$")
 
 TAO_EC_RTCORBA_Dispatching::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index 2ba7369cec1..a4f80a3beb0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -75,9 +75,5 @@ private:
   TAO_EC_Dispatching_Task *tasks_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Dispatching.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 0278f49bfed..cc66a493b88 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -5,10 +5,6 @@
 
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$")
 
 TAO_EC_RTCORBA_Factory::
@@ -273,6 +269,3 @@ TAO_EC_RTCORBA_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   this->body_->destroy_supplier_control (x);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index 2bdbc22ec38..ef07e07bec9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -115,9 +115,5 @@ protected:
   RTCORBA::ThreadpoolLanes lanes_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index f8e5e78df3a..ee376503697 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_Reactive_Dispatching.h"
 #include "EC_ProxySupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$")
 
 TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 9544dcd37ec..0900596c2c4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -55,10 +55,6 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Reactive_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 52c7eb79c11..7006adac822 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,15 +1,10 @@
 // $Id$
 
 #include "EC_Reactive_Timeout_Generator.h"
-
 #include "ace/Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_Reactive_Timeout_Generator, 
+ACE_RCSID (Event,
+           EC_Reactive_Timeout_Generator,
            "$Id$")
 
 TAO_EC_Reactive_Timeout_Generator::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index e75afbcc5fc..299dffc482c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -32,7 +32,7 @@
  * Implements the Timeout_Generator using an ACE_Reactor. Usually
  * the same reactor that is used by the ORB where the EC runs.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_Timeout_Generator 
+class TAO_RTEvent_Export TAO_EC_Reactive_Timeout_Generator
   : public TAO_EC_Timeout_Generator
 {
 public:
@@ -60,10 +60,6 @@ private:
   TAO_EC_Timeout_Adapter event_handler_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 9a484e2316b..514d483c9ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -4,10 +4,6 @@
 #include "EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
 
 TAO_EC_Sched_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index c1093401be5..af1d172d130 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -123,9 +123,5 @@ private:
   RtecScheduler::Info_Type_t info_type_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_SCHED_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index b96abfd40a8..311f0a86447 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -3,10 +3,6 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_QOS_Info.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
 
 TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 29c94f4f892..6f493dbffc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -63,10 +63,6 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SCHEDULING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 39d04fec297..73e4e6f86d2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_SupplierAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
 
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 91572785bc2..827614bc4c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -63,10 +63,6 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_SupplierAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 4bbbf0f2d82..94c7a2f58b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_SupplierControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "EC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_SupplierControl, "$Id$")
 
 TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
@@ -41,8 +37,3 @@ TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *,
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 1db1572fc32..0af5a03aeec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -69,10 +69,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 049f8f88626..a090b438772 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Supplier_Filter_Builder.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
 
 TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 88a25804797..a22c516f9e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -57,10 +57,6 @@ public:
 
 // ****************************************************************
 
-#if defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 321f87bb6ef..3cf2b87baf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -8,10 +8,6 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 04f08fd85e8..db4fe238220 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -99,10 +99,6 @@ private:
   TAO_EC_Trivial_Supplier_Filter filter_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 04db9a3eb61..ef39e461f86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Type_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Type_Filter, "$Id$")
 
 TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 6b731dddec1..cded3117683 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -74,9 +74,5 @@ private:
   RtecEventComm::EventHeader header_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
index 10cb9888350..795db6f4916 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
@@ -4,8 +4,4 @@
 
 #include "Local_ESTypes.h"
 
-#if !defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, Local_ESTypes, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 60d8ac8c459..cc7e66b9fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -38,10 +38,6 @@
 
 typedef RtecEventComm::Event RtecEventComm_Event;
 
-#if defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_LOCAL_ESTYPES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
deleted file mode 100644
index 8f8ef4cfe2d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index a1909033356..220736250a7 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -3157,10 +3157,6 @@ RTEvent = \
   Event/EC_Group_Scheduling.cpp \
   Event/EC_Lifetime_Utils.cpp \
   Event/EC_Lifetime_Utils_T.cpp \
-  Event/EC_MT_Dispatching.cpp \
-  Event/EC_Masked_Type_Filter.cpp \
-  Event/EC_Negation_Filter.cpp \
-  Event/EC_Null_Factory.cpp \
   Event/EC_Null_Scheduling.cpp \
   Event/EC_ObserverStrategy.cpp \
   Event/EC_Per_Supplier_Filter.cpp \
@@ -3300,37 +3296,21 @@ nobase_include_HEADERS += \
   RtecUDPAdminC.h \
   RtecUDPAdminS.h \
   RtecUDPAdminS_T.h \
-  Event/ECG_Address_Server_Base.i \
   Event/ECG_CDR_Message_Receiver.i \
   Event/ECG_CDR_Message_Sender.i \
   Event/ECG_Complex_Address_Server.i \
-  Event/ECG_ConsumerEC_Control.i \
   Event/ECG_Mcast_EH.i \
   Event/ECG_Mcast_Gateway.i \
-  Event/ECG_Reactive_ConsumerEC_Control.i \
   Event/ECG_Simple_Address_Server.i \
-  Event/ECG_Simple_Mcast_EH.i \
   Event/ECG_UDP_EH.i \
   Event/ECG_UDP_Out_Endpoint.i \
   Event/ECG_UDP_Receiver.i \
   Event/ECG_UDP_Sender.inl \
-  Event/EC_And_Filter.i \
-  Event/EC_Basic_Factory.i \
   Event/EC_Basic_Filter_Builder.i \
-  Event/EC_Bitmask_Filter.i \
   Event/EC_Busy_Lock.i \
-  Event/EC_Conjunction_Filter.i \
-  Event/EC_ConsumerAdmin.i \
-  Event/EC_ConsumerControl.i \
   Event/EC_Default_Factory.i \
-  Event/EC_Default_ProxyConsumer.i \
-  Event/EC_Default_ProxySupplier.i \
-  Event/EC_Disjunction_Filter.i \
-  Event/EC_Dispatching.i \
   Event/EC_Dispatching_Task.i \
-  Event/EC_Event_Channel.i \
   Event/EC_Event_Channel_Base.i \
-  Event/EC_Factory.i \
   Event/EC_Filter.i \
   Event/EC_Filter_Builder.i \
   Event/EC_Gateway_IIOP_Factory.i \
@@ -3349,18 +3329,10 @@ nobase_include_HEADERS += \
   Event/EC_ProxySupplier.i \
   Event/EC_QOS_Info.i \
   Event/EC_Reactive_ConsumerControl.i \
-  Event/EC_Reactive_Dispatching.i \
   Event/EC_Reactive_SupplierControl.i \
-  Event/EC_Reactive_Timeout_Generator.i \
-  Event/EC_Scheduling_Strategy.i \
-  Event/EC_SupplierAdmin.i \
-  Event/EC_SupplierControl.i \
   Event/EC_Supplier_Filter.i \
-  Event/EC_Supplier_Filter_Builder.i \
   Event/EC_Timeout_Filter.i \
   Event/EC_Timeout_Generator.i \
-  Event/EC_Trivial_Supplier_Filter.i \
-  Event/EC_Type_Filter.i \
   Event_Utilities.i \
   RtecDefaultEventDataC.inl \
   RtecDefaultEventDataS.inl \
@@ -4382,9 +4354,7 @@ libTAO_RTCORBAEvent_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Event/EC_RTCORBA_Dispatching.h \
-  Event/EC_RTCORBA_Factory.h \
-  Event/EC_RTCORBA_Dispatching.inl \
-  Event/EC_RTCORBA_Factory.inl
+  Event/EC_RTCORBA_Factory.h
 
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
@@ -4645,7 +4615,6 @@ nobase_include_HEADERS += \
   Event/Event_Channel.i \
   Event/Event_Manip.i \
   Event/GPlot_File.i \
-  Event/Local_ESTypes.i \
   Event/Memory_Pools.i \
   Event/RT_Task.i \
   Event/Timer_Module.i
@@ -4746,7 +4715,7 @@ nobase_include_HEADERS += \
 
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTKokyuEvent.am 
+## Makefile.RTKokyuEvent.am
 
 if BUILD_CORBA_MESSAGING
 
@@ -4795,13 +4764,12 @@ nobase_include_HEADERS += \
   Event/EC_Kokyu_Scheduling.h \
   Event/EC_Kokyu_Dispatching.i \
   Event/EC_Kokyu_Factory.i \
-  Event/EC_Kokyu_Filter.i \
   Event/EC_Kokyu_Filter_Builder.i \
   Event/EC_Kokyu_Scheduling.i
 
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTSchedEvent.am 
+## Makefile.RTSchedEvent.am
 
 if BUILD_CORBA_MESSAGING
 
@@ -4848,10 +4816,8 @@ nobase_include_HEADERS += \
   Event/EC_Sched_Factory.h \
   Event/EC_Sched_Filter.h \
   Event/EC_Sched_Filter_Builder.h \
-  Event/EC_Priority_Dispatching.i \
   Event/EC_Priority_Scheduling.i \
   Event/EC_Sched_Factory.i \
-  Event/EC_Sched_Filter.i \
   Event/EC_Sched_Filter_Builder.i
 
 endif BUILD_CORBA_MESSAGING
@@ -4859,7 +4825,7 @@ endif BUILD_CORBA_MESSAGING
 EXTRA_DIST += \
   RTSchedEvent.rc
 
-## Makefile.RT_Notification.am 
+## Makefile.RT_Notification.am
 
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
@@ -4923,7 +4889,7 @@ endif BUILD_RT_CORBA
 EXTRA_DIST += \
   RT_Notification.rc
 
-## Makefile.Security.am 
+## Makefile.Security.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
@@ -5242,7 +5208,7 @@ endif BUILD_CORBA_MESSAGING
 EXTRA_DIST += \
   Security.rc
 
-## Makefile.SSLIOP.am 
+## Makefile.SSLIOP.am
 
 if BUILD_INTERCEPTORS
 if BUILD_CORBA_MESSAGING