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

139 files changed, 62 insertions, 508 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 30bb05c9b98..67092db92fa 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,56 @@
+Wed Jan  5 11:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Builder.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventChannel.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Proxy_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Builder.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Refcountable.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Worker_Task.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.{h,cpp,inl}:
+          Removed inl file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
 Wed Jan  5 11:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/SchedConfig_Scheduler.{h,cpp,i}:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 3ff5ba53bb7..a888a4efd9c 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -2038,38 +2038,16 @@ nobase_include_HEADERS += \
   Notify/Worker_Task.h \
   Notify/Admin.inl \
   Notify/AdminProperties.inl \
-  Notify/Any/AnyEvent.inl \
-  Notify/Any/CosEC_ProxyPushConsumer.inl \
-  Notify/Any/CosEC_ProxyPushSupplier.inl \
-  Notify/Any/ProxyPushConsumer.inl \
-  Notify/Any/ProxyPushSupplier.inl \
-  Notify/Any/PushConsumer.inl \
-  Notify/Any/PushSupplier.inl \
   Notify/Buffering_Strategy.inl \
-  Notify/Builder.inl \
   Notify/Consumer.inl \
-  Notify/ConsumerAdmin.inl \
-  Notify/CosNotify_Service.inl \
-  Notify/Default_Factory.inl \
   Notify/Delivery_Request.inl \
-  Notify/ETCL_Filter.inl \
-  Notify/ETCL_FilterFactory.inl \
   Notify/Event.inl \
-  Notify/EventChannel.inl \
-  Notify/EventChannelFactory.inl \
   Notify/EventType.inl \
-  Notify/EventTypeSeq.inl \
   Notify/Event_Manager.inl \
   Notify/FilterAdmin.inl \
   Notify/ID_Factory.inl \
   Notify/Method_Request.inl \
-  Notify/Method_Request_Dispatch.inl \
-  Notify/Method_Request_Event.inl \
-  Notify/Method_Request_Lookup.inl \
-  Notify/Method_Request_Shutdown.inl \
-  Notify/Method_Request_Updates.inl \
   Notify/Method_Request_Updates_T.inl \
-  Notify/Name_Value_Pair.inl \
   Notify/Object.inl \
   Notify/POA_Helper.inl \
   Notify/Peer.inl \
@@ -2078,34 +2056,15 @@ nobase_include_HEADERS += \
   Notify/Property_Boolean.inl \
   Notify/Proxy.inl \
   Notify/ProxyConsumer.inl \
-  Notify/ProxyConsumer_T.inl \
   Notify/ProxySupplier.inl \
-  Notify/ProxySupplier_T.inl \
-  Notify/Proxy_T.inl \
   Notify/QoSProperties.inl \
   Notify/Reactive_Task.inl \
-  Notify/Reconnection_Registry.inl \
-  Notify/Refcountable.inl \
   Notify/Routing_Slip.inl \
   Notify/Routing_Slip_Queue.inl \
-  Notify/Sequence/Batch_Buffering_Strategy.inl \
-  Notify/Sequence/SequenceProxyPushConsumer.inl \
-  Notify/Sequence/SequenceProxyPushSupplier.inl \
-  Notify/Sequence/SequencePushConsumer.inl \
-  Notify/Sequence/SequencePushSupplier.inl \
-  Notify/Structured/StructuredEvent.inl \
-  Notify/Structured/StructuredProxyPushConsumer.inl \
-  Notify/Structured/StructuredProxyPushSupplier.inl \
-  Notify/Structured/StructuredPushConsumer.inl \
-  Notify/Structured/StructuredPushSupplier.inl \
   Notify/Subscription_Change_Worker.inl \
   Notify/Supplier.inl \
-  Notify/SupplierAdmin.inl \
   Notify/ThreadPool_Task.inl \
-  Notify/Timer_Queue.inl \
-  Notify/Timer_Reactor.inl \
   Notify/Topology_Object.inl \
-  Notify/Worker_Task.inl \
   Notify/Method_Request_Updates_T.cpp \
   Notify/ProxyConsumer_T.cpp \
   Notify/ProxySupplier_T.cpp \
@@ -4862,10 +4821,6 @@ nobase_include_HEADERS += \
   Notify/RT_POA_Helper.h \
   Notify/RT_Properties.h \
   Notify/Structured/RT_StructuredProxyPushSupplier.h \
-  Notify/RT_Builder.inl \
-  Notify/RT_Factory.inl \
-  Notify/RT_Notify_Service.inl \
-  Notify/RT_POA_Helper.inl \
   Notify/RT_Properties.inl \
   Notify/Structured/RT_StructuredProxyPushSupplier.inl
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 1b3d59089b4..de4b9b46faa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -2,10 +2,6 @@
 
 #include "AnyEvent.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "AnyEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
 
 #include "../Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 9ea70ded141..3b56a9bedaf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -113,10 +113,6 @@ protected:
   CORBA::Any any_copy_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "AnyEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_ANYEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index f12b4a6d210..6da0cae1abc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "CosEC_ProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 8221afc10fe..769e17caf70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -82,10 +82,6 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_COSEC_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 76caa3c43b5..73db5b163a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "CosEC_ProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 143232fe6d8..4b0ac337244 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -81,10 +81,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_COSEC_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 4fab1a82903..692927519a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "ProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index ef66f3ec7b9..132220e166c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -93,9 +93,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index acb9df825dd..982ef04e1ee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "ProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 158292d9f86..f2a1af9cf02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -90,10 +90,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index e6958fdb4aa..aa474ed02e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "PushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "PushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify,
            TAO_Notify_PushConsumer,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index 69bc1d9bc35..37967cc8d3b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -69,9 +69,5 @@ protected:
   CosEventComm::PushConsumer_var push_consumer_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "PushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index 948ed38f936..fe629d6759a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "PushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "PushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$")
 #include "../Properties.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 1a108bad3ba..a0726ccda2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -54,9 +54,5 @@ protected:
   CosEventComm::PushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "PushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 5aa8b9c2390..06723e313b9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "Builder.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Builder.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify,
            Builder,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index 4be050d60e9..1811386d755 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -166,10 +166,6 @@ public:
     );
 };
 
-#if defined (__ACE_INLINE__)
-#include "Builder.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.inl b/TAO/orbsvcs/orbsvcs/Notify/Builder.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 92fa42c92be..89279421cc7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -2,10 +2,6 @@
 
 #include "ConsumerAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ConsumerAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (RT_Notify,
            TAO_Notify_ConsumerAdmin,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 2f4632fba01..590ca84b5f2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -243,10 +243,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ConsumerAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 680d8d2432f..d077b3b3c02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -79,9 +79,5 @@ ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service)
 
 ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD)
 
-#if defined (__ACE_INLINE__)
-#include "CosNotify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_COSNOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 7f50ca0368e..f0589401e12 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -2,12 +2,8 @@
 
 #include "Default_Factory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Default_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           TAO_Notify_Default_Factory, 
+ACE_RCSID (Notify,
+           TAO_Notify_Default_Factory,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index e82cab43b1b..9c6ac6f56a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -93,9 +93,5 @@ public:
 
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
 
-#if defined (__ACE_INLINE__)
-#include "Default_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index b1d89eb552a..28deb45ebf3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "ETCL_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ETCL_Filter.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$")
 
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index af16effffeb..40b3c622b34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -168,9 +168,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ETCL_Filter.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ETCL_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 4c01423eb95..2f63881f0de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -2,10 +2,6 @@
 
 #include "ETCL_FilterFactory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ETCL_FilterFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
 
 #include "ETCL_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 5c67cbb8f5a..4ddd43747e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -88,10 +88,6 @@ protected:
 
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
 
-#if defined (__ACE_INLINE__)
-#include "ETCL_FilterFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_ETCL_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 299617258aa..afabca9b5f4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -2,10 +2,6 @@
 
 #include "EventChannel.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EventChannel.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Container_T.h"
 #include "EventChannelFactory.h"
 #include "ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 43dce44913b..5413a5b8e1b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -243,10 +243,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "EventChannel.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENTCHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 14f84bb280e..6d1e1efaf48 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -2,10 +2,6 @@
 
 #include "EventChannelFactory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EventChannelFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 41af5f203bc..c6df6b73aa0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -194,10 +194,6 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "EventChannelFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENTCHANNELFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index d72f8df40e7..e5cff03e5a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "EventTypeSeq.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EventTypeSeq.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Topology_Saver.h"
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index bf80a8c384c..1a80b261ea1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -78,9 +78,5 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "EventTypeSeq.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_EVENTTYPESEQ_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index ab6ad3a16aa..f11c37d5ae4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Dispatch.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 
 #include "tao/debug.h"
@@ -296,10 +292,3 @@ TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
   return request;
 }
 
-/*********************************************************************************************************/
-
-#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/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 41b9682c6fb..55e59b143eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -164,9 +164,5 @@ public:
 
 /*******************************************************************************************************/
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index ee41ff27da4..5a5f0fd1c4b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Method_Request_Event.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Event.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Delivery_Request.h"
 
 ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 13707a77e72..64d17d48f58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -97,9 +97,5 @@ private:
   TAO_Notify_Event_var event_var_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Event.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index b038d2d84f4..34332749637 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Lookup.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Lookup.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 89d9b8f6c1b..66d9de69c7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -132,9 +132,5 @@ public:
   virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Lookup.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 5fb9c39aca9..69e6d0aa1ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -3,10 +3,6 @@
 #include "Method_Request_Shutdown.h"
 #include "ThreadPool_Task.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Shutdown.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$")
 
 TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index 0144d188451..0b8259583e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -49,9 +49,5 @@ private:
   TAO_Notify_ThreadPool_Task* task_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Shutdown.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 48b5c3fe4ea..bf2c0f0d23d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Updates.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Updates.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index def6c4efdaf..05ac8f470e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -81,9 +81,5 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Updates.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl
deleted file mode 100644
index bf5cc3848c2..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Method_Request_Updates.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 0fd7509d890..257b4148ab6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Name_Value_Pair.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Name_Value_Pair.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Property_T.h"
 #include "ace/OS_String.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
index 0b569a7e77c..f3b02be655b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
@@ -94,9 +94,5 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
-#if defined (__ACE_INLINE__)
-#include "Name_Value_Pair.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* NAME_VALUE_PAIR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.inl b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 08b7bc76dfe..b5da6701dc9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -6,10 +6,6 @@
 #include "ProxyConsumer_T.h"
 #include "SupplierAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyConsumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$")
 
 #include "Event_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 6524ce1c0ab..f8ee14512bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -30,8 +30,8 @@
  *
  */
 template <class SERVANT_TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T 
-  : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, 
+class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T
+  : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>,
     public virtual TAO_Notify_ProxyConsumer
 {
 public:
@@ -71,10 +71,6 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "ProxyConsumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ProxyConsumer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 67a74da448e..23dad7b45b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -5,10 +5,6 @@
 
 #include "ProxySupplier_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxySupplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$")
 
 #include "Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index ba545f61ff5..5c18d79424e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -146,10 +146,6 @@ protected:
   ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "ProxySupplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ProxySupplier_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 79856ed053b..50cf9e72f0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -5,10 +5,6 @@
 #ifndef TAO_Notify_PROXY_T_CPP
 #define TAO_Notify_PROXY_T_CPP
 
-#if ! defined (__ACE_INLINE__)
-#include "Proxy_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$")
 
 template <class SERVANT_TYPE>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 7a2726c251c..b9b0e26ee0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -143,10 +143,6 @@ template class TAO_Notify_Serv_Export
 TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
-#if defined (__ACE_INLINE__)
-#include "Proxy_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Proxy_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index ecbcb9a205d..3c9d6beb3a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -10,12 +10,8 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "Object.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Builder.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_RT_Builder, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_RT_Builder,
            "$Id$")
 
 TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 29bc810667b..d8e5834d2e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -43,9 +43,5 @@ public:
   virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_Builder.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index b587353f0c4..014c4da3984 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "RT_Factory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RT_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Structured/RT_StructuredProxyPushSupplier.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 0a09a483bb8..79de7f0749d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -93,9 +93,5 @@ public:
 
 ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory)
 
-#if defined (__ACE_INLINE__)
-#include "RT_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index b62aa0fc326..9c1f31d8334 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -2,10 +2,6 @@
 
 #include "RT_Notify_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Notify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
 
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index fd84f39c0cc..5531ba67246 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -55,9 +55,5 @@ protected:
 
 ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service)
 
-#if defined (__ACE_INLINE__)
-#include "RT_Notify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_NOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 4a507f456f7..2631faef282 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -7,12 +7,8 @@
 #include "RT_Properties.h"
 #include "ace/SString.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_POA_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_RT_POA_Helper, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_RT_POA_Helper,
            "$Id$")
 
 TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 24b3491f52c..23a14864aff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -56,9 +56,5 @@ public:
   void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_POA_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_POA_Helper_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 965292a3b67..b2f84836d47 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -8,11 +8,6 @@
  *
  */
 #include "Reconnection_Registry.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Reconnection_Registry.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "tao/debug.h"
 #include "Properties.h"
 #include "Topology_Saver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 8571acc47db..69f5adaeaa9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -92,9 +92,5 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
-#if defined (__ACE_INLINE__)
-#include "Reconnection_Registry.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ <ace/post.h>
 #endif /* TAO_NOTIFY_RECONNECTION_REGISTRY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.inl b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.inl
deleted file mode 100644
index 19ec798e989..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-//  $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 7d378105c84..b0d869ce2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -3,11 +3,6 @@
 #include "Refcountable.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Guard_T.h"
 
 ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index bd8a7d5423c..c38000882d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -40,7 +40,7 @@ public:
   /// Destructor
   virtual ~TAO_Notify_Refcountable ();
 
-  /// This method sigantures deliberately match the 
+  /// This method sigantures deliberately match the
   /// RefCounting methods required for ESF Proxy
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
@@ -56,10 +56,6 @@ protected:
   TAO_SYNCH_MUTEX lock_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_REFCOUNTABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
index 28fe6cd3364..9d3083956be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
@@ -4,10 +4,6 @@
 #include "../Method_Request_Event.h"
 #include "ace/Null_Condition.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Batch_Buffering_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_Batch_Buffering_Strategy, "$Id$")
 
 TAO_Notify_Batch_Buffering_Strategy::TAO_Notify_Batch_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
index bb682495e85..069ad98a710 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
@@ -52,9 +52,5 @@ protected:
   int dequeue_i (int max_deq_count, CosNotification::EventBatch& event_batch);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Batch_Buffering_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_BATCH_BUFFERING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 677bfdbe73e..11b50b7fd22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "SequenceProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequenceProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index a47e2510576..f386ccb833f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -94,10 +94,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SequenceProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SEQUENCEPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 1bf551586dc..8cf6ba6cc64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "SequenceProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequenceProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 950ee882aa4..f7e45752747 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -91,10 +91,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SequenceProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SEQUENCEPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 964ffb35a10..dc162c3d9ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "SequencePushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequencePushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index e2c39d71b43..76ff5d049ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -91,9 +91,5 @@ protected:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "SequencePushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index e5699464314..edcf7bee687 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "SequencePushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequencePushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$")
 
 #include "../Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index c6713a2bc64..bfebfd33ea2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -53,9 +53,5 @@ protected:
   CosNotifyComm::SequencePushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "SequencePushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index c92069294b0..44027df4771 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -6,10 +6,6 @@
 #include "tao/debug.h"
 #include "../Method_Request_Dispatch.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$")
 
 TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index b0badca8a75..0c5459698a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -56,9 +56,5 @@ private:
   Event_Forwarder::StructuredProxyPushSupplier_var event_forwarder_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 7bd714ac793..e226e837d4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredEvent.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
 #include "../PropertySeq.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 4457f1c4298..a1623ec454f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -106,9 +106,5 @@ protected:
   CosNotification::StructuredEvent notification_copy;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 7966c3c2e3f..8aaf6235aac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 35fc44fe559..17b7059a08d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -95,10 +95,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "StructuredProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index fac13c9cdf1..6cbe8d178b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 5990e0ebd12..6ed8e9f084c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -94,10 +94,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 01bb530cf57..785ff8c2cf1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "StructuredPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
 #include "../Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 9e66107f208..64cf2fbd424 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -72,9 +72,5 @@ protected:
   CosNotifyComm::StructuredPushConsumer_var push_consumer_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 8c06d5864ee..61ded91e7e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
 #include "../Properties.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index f0beb284f54..9468e99cbeb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -53,9 +53,5 @@ protected:
   CosNotifyComm::StructuredPushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 5f77dc25f77..0476be236b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -2,10 +2,6 @@
 
 #include "SupplierAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SupplierAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 2a3f168f7ef..608fe7871e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -210,10 +210,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SupplierAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index 222420161e0..b083b78b6e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -2,10 +2,6 @@
 
 #include "Timer_Queue.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Timer_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$")
 
 TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 17410fdfd4a..b5fd2fd3842 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -59,9 +59,5 @@ protected:
   ACE_Timer_Heap timer_queue_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Timer_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl
deleted file mode 100644
index eeaf18f3e5f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Timer_Queue.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index ea6ce77fee6..1a06bdb98de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -2,10 +2,6 @@
 
 #include "Timer_Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Timer_Reactor.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Timer_Reactor, "$Id$")
 
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 0ec20ac850e..cadb1b14071 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -54,9 +54,5 @@ protected:
   ACE_Reactor* reactor_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Timer_Reactor.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl
deleted file mode 100644
index ba9c8b4cae1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Timer_Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index ce36af1612b..7c1e767bd0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -2,10 +2,6 @@
 
 #include "Worker_Task.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Worker_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$")
 
 TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 4bb5542b275..63169cbf1ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -63,9 +63,5 @@ protected:
   virtual ~TAO_Notify_Worker_Task ();
 };
 
-#if defined (__ACE_INLINE__)
-#include "Worker_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_WORKER_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$