Fri Jul 28 15:38:11 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>

15 files changed, 183 insertions, 163 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2959c7b7d50..356d8f02580 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Jul 28 15:38:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am
+        * orbsvcs/tests/Event/lib/Makefile.am
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+        * orbsvcs/tests/EC_Mcast/Makefile.am
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+        * orbsvcs/examples/Security/Send_File/Makefile.am
+        * tao/Makefile.am
+        * performance-tests/POA/Demux/Makefile.am
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+
+          Fixed Makefile.ams to reflect changes from
+          Thu Jul 27 20:50:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        
 Fri Jul 28 14:29:53 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * Most remaining run_test.pl and run_all.pl scripts
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
index 96353bcf069..88fb5944eaf 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
@@ -66,7 +66,7 @@ fp_client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 fp_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -104,7 +104,7 @@ fp_server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 fp_server_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
index 26b9c1c0a2c..64e4ad8dc81 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
@@ -66,7 +66,7 @@ mif_client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 mif_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -104,7 +104,7 @@ mif_server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 mif_server_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
index cf33edb2f99..bbe4466978d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
@@ -68,7 +68,7 @@ muf_client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 muf_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -107,7 +107,7 @@ muf_server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 muf_server_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
index c65c9708777..a3e19081ec6 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -59,7 +59,7 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -83,7 +83,7 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 9ba84c529a9..0f3d3e91106 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -447,7 +447,7 @@ libTAO_AV_la_LIBADD = \
 
 nobase_include_HEADERS += \
   AV/AVStreams_i.h \
-  AV/AVStreams_i.i \
+  AV/AVStreams_i.inl\
   AV/AV_Core.h \
   AV/AV_export.h \
   AV/Endpoint_Strategy.h \
@@ -455,16 +455,16 @@ nobase_include_HEADERS += \
   AV/Endpoint_Strategy_T.h \
   AV/Fill_ACE_QoS.h \
   AV/FlowSpec_Entry.h \
-  AV/FlowSpec_Entry.i \
+  AV/FlowSpec_Entry.inl\
   AV/Flows_T.cpp \
   AV/Flows_T.h \
   AV/MCast.h \
-  AV/MCast.i \
+  AV/MCast.inl\
   AV/Policy.h \
-  AV/Policy.i \
+  AV/Policy.inl\
   AV/Protocol_Factory.h \
   AV/QoS_UDP.h \
-  AV/QoS_UDP.i \
+  AV/QoS_UDP.inl\
   AV/RTCP.h \
   AV/RTCP_Channel.h \
   AV/RTCP_Packet.h \
@@ -473,9 +473,9 @@ nobase_include_HEADERS += \
   AV/SCTP_SEQ.h \
   AV/TCP.h \
   AV/Transport.h \
-  AV/Transport.i \
+  AV/Transport.inl\
   AV/UDP.h \
-  AV/UDP.i \
+  AV/UDP.inl\
   AV/default_resource.h \
   AV/global.h \
   AV/md5.h \
@@ -972,7 +972,7 @@ nobase_include_HEADERS += \
   TimeBaseS_T.cpp \
   TimeBaseS_T.inl \
   Time_Utilities.h \
-  Time_Utilities.i \
+  Time_Utilities.inl\
   svc_utils_export.h
 
 pkgconfig_DATA += \
@@ -1125,49 +1125,49 @@ libTAO_CosEvent_Serv_la_LIBADD = \
 
 nobase_include_HEADERS += \
   CosEvent/CEC_ConsumerAdmin.h \
-  CosEvent/CEC_ConsumerAdmin.i \
+  CosEvent/CEC_ConsumerAdmin.inl\
   CosEvent/CEC_ConsumerControl.h \
   CosEvent/CEC_Default_Factory.h \
-  CosEvent/CEC_Default_Factory.i \
+  CosEvent/CEC_Default_Factory.inl\
   CosEvent/CEC_Defaults.h \
   CosEvent/CEC_Dispatching.h \
   CosEvent/CEC_Dispatching_Task.h \
-  CosEvent/CEC_Dispatching_Task.i \
+  CosEvent/CEC_Dispatching_Task.inl\
   CosEvent/CEC_DynamicImplementation.h \
-  CosEvent/CEC_DynamicImplementation.i \
+  CosEvent/CEC_DynamicImplementation.inl\
   CosEvent/CEC_EventChannel.h \
-  CosEvent/CEC_EventChannel.i \
+  CosEvent/CEC_EventChannel.inl\
   CosEvent/CEC_Event_Loader.h \
   CosEvent/CEC_Factory.h \
   CosEvent/CEC_MT_Dispatching.h \
   CosEvent/CEC_ProxyPullConsumer.h \
-  CosEvent/CEC_ProxyPullConsumer.i \
+  CosEvent/CEC_ProxyPullConsumer.inl\
   CosEvent/CEC_ProxyPullSupplier.h \
-  CosEvent/CEC_ProxyPullSupplier.i \
+  CosEvent/CEC_ProxyPullSupplier.inl\
   CosEvent/CEC_ProxyPushConsumer.h \
-  CosEvent/CEC_ProxyPushConsumer.i \
+  CosEvent/CEC_ProxyPushConsumer.inl\
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEvent/CEC_ProxyPushSupplier.i \
+  CosEvent/CEC_ProxyPushSupplier.inl\
   CosEvent/CEC_Pulling_Strategy.h \
   CosEvent/CEC_Reactive_ConsumerControl.h \
-  CosEvent/CEC_Reactive_ConsumerControl.i \
+  CosEvent/CEC_Reactive_ConsumerControl.inl\
   CosEvent/CEC_Reactive_Pulling_Strategy.h \
-  CosEvent/CEC_Reactive_Pulling_Strategy.i \
+  CosEvent/CEC_Reactive_Pulling_Strategy.inl\
   CosEvent/CEC_Reactive_SupplierControl.h \
-  CosEvent/CEC_Reactive_SupplierControl.i \
+  CosEvent/CEC_Reactive_SupplierControl.inl\
   CosEvent/CEC_SupplierAdmin.h \
-  CosEvent/CEC_SupplierAdmin.i \
+  CosEvent/CEC_SupplierAdmin.inl\
   CosEvent/CEC_SupplierControl.h \
   CosEvent/CEC_TypedConsumerAdmin.h \
-  CosEvent/CEC_TypedConsumerAdmin.i \
+  CosEvent/CEC_TypedConsumerAdmin.inl\
   CosEvent/CEC_TypedEvent.h \
-  CosEvent/CEC_TypedEvent.i \
+  CosEvent/CEC_TypedEvent.inl\
   CosEvent/CEC_TypedEventChannel.h \
-  CosEvent/CEC_TypedEventChannel.i \
+  CosEvent/CEC_TypedEventChannel.inl\
   CosEvent/CEC_TypedProxyPushConsumer.h \
-  CosEvent/CEC_TypedProxyPushConsumer.i \
+  CosEvent/CEC_TypedProxyPushConsumer.inl\
   CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEvent/CEC_TypedSupplierAdmin.i \
+  CosEvent/CEC_TypedSupplierAdmin.inl\
   CosEvent/event_serv_export.h
 
 pkgconfig_DATA += \
@@ -1490,11 +1490,11 @@ nobase_include_HEADERS += \
   PortableGroup/PortableGroup_Request_Dispatcher.h \
   PortableGroup/Portable_Group_Map.h \
   PortableGroup/UIPMC_Acceptor.h \
-  PortableGroup/UIPMC_Acceptor.i \
+  PortableGroup/UIPMC_Acceptor.inl\
   PortableGroup/UIPMC_Connection_Handler.h \
   PortableGroup/UIPMC_Connector.h \
   PortableGroup/UIPMC_Endpoint.h \
-  PortableGroup/UIPMC_Endpoint.i \
+  PortableGroup/UIPMC_Endpoint.inl\
   PortableGroup/UIPMC_Factory.h \
   PortableGroup/UIPMC_Message_Block_Data_Iterator.h \
   PortableGroup/UIPMC_Profile.h \
@@ -3586,47 +3586,47 @@ EXTRA_DIST += \
 nobase_include_HEADERS += \
   ESF/ESF_Busy_Lock.cpp \
   ESF/ESF_Busy_Lock.h \
-  ESF/ESF_Busy_Lock.i \
+  ESF/ESF_Busy_Lock.inl\
   ESF/ESF_Copy_On_Read.cpp \
   ESF/ESF_Copy_On_Read.h \
   ESF/ESF_Copy_On_Write.cpp \
   ESF/ESF_Copy_On_Write.h \
-  ESF/ESF_Copy_On_Write.i \
+  ESF/ESF_Copy_On_Write.inl\
   ESF/ESF_Defaults.h \
   ESF/ESF_Delayed_Changes.cpp \
   ESF/ESF_Delayed_Changes.h \
-  ESF/ESF_Delayed_Changes.i \
+  ESF/ESF_Delayed_Changes.inl\
   ESF/ESF_Delayed_Command.cpp \
   ESF/ESF_Delayed_Command.h \
-  ESF/ESF_Delayed_Command.i \
+  ESF/ESF_Delayed_Command.inl\
   ESF/ESF_Immediate_Changes.cpp \
   ESF/ESF_Immediate_Changes.h \
-  ESF/ESF_Immediate_Changes.i \
+  ESF/ESF_Immediate_Changes.inl\
   ESF/ESF_Peer_Admin.cpp \
   ESF/ESF_Peer_Admin.h \
   ESF/ESF_Peer_Workers.cpp \
   ESF/ESF_Peer_Workers.h \
-  ESF/ESF_Peer_Workers.i \
+  ESF/ESF_Peer_Workers.inl\
   ESF/ESF_Proxy_Admin.cpp \
   ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Admin.i \
+  ESF/ESF_Proxy_Admin.inl\
   ESF/ESF_Proxy_Collection.cpp \
   ESF/ESF_Proxy_Collection.h \
   ESF/ESF_Proxy_List.cpp \
   ESF/ESF_Proxy_List.h \
-  ESF/ESF_Proxy_List.i \
+  ESF/ESF_Proxy_List.inl\
   ESF/ESF_Proxy_RB_Tree.cpp \
   ESF/ESF_Proxy_RB_Tree.h \
-  ESF/ESF_Proxy_RB_Tree.i \
+  ESF/ESF_Proxy_RB_Tree.inl\
   ESF/ESF_Proxy_RefCount_Guard.cpp \
   ESF/ESF_Proxy_RefCount_Guard.h \
-  ESF/ESF_Proxy_RefCount_Guard.i \
+  ESF/ESF_Proxy_RefCount_Guard.inl\
   ESF/ESF_RefCount_Guard.cpp \
   ESF/ESF_RefCount_Guard.h \
-  ESF/ESF_RefCount_Guard.i \
+  ESF/ESF_RefCount_Guard.inl\
   ESF/ESF_Shutdown_Proxy.cpp \
   ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
+  ESF/ESF_Shutdown_Proxy.inl\
   ESF/ESF_Worker.cpp \
   ESF/ESF_Worker.h \
   ESF/esf_export.h
@@ -3876,7 +3876,7 @@ nobase_include_HEADERS += \
   Event/event_export.h \
   Event/event_skel_export.h \
   Event_Utilities.h \
-  Event_Utilities.i \
+  Event_Utilities.inl\
   RtecDefaultEventData.idl \
   RtecDefaultEventDataC.h \
   RtecDefaultEventDataC.inl \
@@ -4074,112 +4074,112 @@ libTAO_RTEvent_Serv_la_LIBADD = \
 nobase_include_HEADERS += \
   Channel_Clients_T.cpp \
   Channel_Clients_T.h \
-  Channel_Clients_T.i \
+  Channel_Clients_T.inl\
   Event/ECG_Adapters.h \
   Event/ECG_CDR_Message_Receiver.h \
-  Event/ECG_CDR_Message_Receiver.i \
+  Event/ECG_CDR_Message_Receiver.inl\
   Event/ECG_CDR_Message_Sender.h \
-  Event/ECG_CDR_Message_Sender.i \
+  Event/ECG_CDR_Message_Sender.inl\
   Event/ECG_Complex_Address_Server.h \
-  Event/ECG_Complex_Address_Server.i \
+  Event/ECG_Complex_Address_Server.inl\
   Event/ECG_ConsumerEC_Control.h \
   Event/ECG_Mcast_EH.h \
-  Event/ECG_Mcast_EH.i \
+  Event/ECG_Mcast_EH.inl\
   Event/ECG_Mcast_Gateway.h \
-  Event/ECG_Mcast_Gateway.i \
+  Event/ECG_Mcast_Gateway.inl\
   Event/ECG_Reactive_ConsumerEC_Control.h \
   Event/ECG_Reconnect_ConsumerEC_Control.h \
   Event/ECG_Simple_Address_Server.h \
-  Event/ECG_Simple_Address_Server.i \
+  Event/ECG_Simple_Address_Server.inl\
   Event/ECG_Simple_Mcast_EH.h \
   Event/ECG_UDP_EH.h \
-  Event/ECG_UDP_EH.i \
+  Event/ECG_UDP_EH.inl\
   Event/ECG_UDP_Out_Endpoint.h \
-  Event/ECG_UDP_Out_Endpoint.i \
+  Event/ECG_UDP_Out_Endpoint.inl\
   Event/ECG_UDP_Receiver.h \
-  Event/ECG_UDP_Receiver.i \
+  Event/ECG_UDP_Receiver.inl\
   Event/ECG_UDP_Sender.h \
   Event/ECG_UDP_Sender.inl \
   Event/EC_And_Filter.h \
   Event/EC_Basic_Factory.h \
   Event/EC_Basic_Filter_Builder.h \
-  Event/EC_Basic_Filter_Builder.i \
+  Event/EC_Basic_Filter_Builder.inl\
   Event/EC_Bitmask_Filter.h \
   Event/EC_Busy_Lock.cpp \
   Event/EC_Busy_Lock.h \
-  Event/EC_Busy_Lock.i \
+  Event/EC_Busy_Lock.inl\
   Event/EC_Channel_Destroyer.h \
   Event/EC_Conjunction_Filter.h \
   Event/EC_ConsumerAdmin.h \
   Event/EC_ConsumerControl.h \
   Event/EC_Default_Factory.h \
-  Event/EC_Default_Factory.i \
+  Event/EC_Default_Factory.inl\
   Event/EC_Default_ProxyConsumer.h \
   Event/EC_Default_ProxySupplier.h \
   Event/EC_Disjunction_Filter.h \
   Event/EC_Dispatching.h \
   Event/EC_Dispatching_Task.h \
-  Event/EC_Dispatching_Task.i \
+  Event/EC_Dispatching_Task.inl\
   Event/EC_Event_Channel.h \
   Event/EC_Event_Channel_Base.h \
-  Event/EC_Event_Channel_Base.i \
+  Event/EC_Event_Channel_Base.inl\
   Event/EC_Factory.h \
   Event/EC_Filter.h \
-  Event/EC_Filter.i \
+  Event/EC_Filter.inl\
   Event/EC_Filter_Builder.h \
-  Event/EC_Filter_Builder.i \
+  Event/EC_Filter_Builder.inl\
   Event/EC_Gateway.h \
   Event/EC_Gateway_IIOP.h \
   Event/EC_Gateway_IIOP_Factory.h \
-  Event/EC_Gateway_IIOP_Factory.i \
+  Event/EC_Gateway_IIOP_Factory.inl\
   Event/EC_Group_Scheduling.h \
   Event/EC_Group_Scheduling.inl \
   Event/EC_Lifetime_Utils.h \
-  Event/EC_Lifetime_Utils.i \
+  Event/EC_Lifetime_Utils.inl\
   Event/EC_Lifetime_Utils_T.cpp \
   Event/EC_Lifetime_Utils_T.h \
-  Event/EC_Lifetime_Utils_T.i \
+  Event/EC_Lifetime_Utils_T.inl\
   Event/EC_MT_Dispatching.h \
   Event/EC_Masked_Type_Filter.h \
   Event/EC_Negation_Filter.h \
   Event/EC_Null_Factory.h \
   Event/EC_Null_Scheduling.h \
-  Event/EC_Null_Scheduling.i \
+  Event/EC_Null_Scheduling.inl\
   Event/EC_ObserverStrategy.h \
-  Event/EC_ObserverStrategy.i \
+  Event/EC_ObserverStrategy.inl\
   Event/EC_Per_Supplier_Filter.h \
-  Event/EC_Per_Supplier_Filter.i \
+  Event/EC_Per_Supplier_Filter.inl\
   Event/EC_Prefix_Filter_Builder.h \
-  Event/EC_Prefix_Filter_Builder.i \
+  Event/EC_Prefix_Filter_Builder.inl\
   Event/EC_ProxyConsumer.h \
-  Event/EC_ProxyConsumer.i \
+  Event/EC_ProxyConsumer.inl\
   Event/EC_ProxySupplier.h \
-  Event/EC_ProxySupplier.i \
+  Event/EC_ProxySupplier.inl\
   Event/EC_Proxy_Disconnector.h \
   Event/EC_QOS_Info.h \
-  Event/EC_QOS_Info.i \
+  Event/EC_QOS_Info.inl\
   Event/EC_Reactive_ConsumerControl.h \
-  Event/EC_Reactive_ConsumerControl.i \
+  Event/EC_Reactive_ConsumerControl.inl\
   Event/EC_Reactive_Dispatching.h \
   Event/EC_Reactive_SupplierControl.h \
-  Event/EC_Reactive_SupplierControl.i \
+  Event/EC_Reactive_SupplierControl.inl\
   Event/EC_Reactive_Timeout_Generator.h \
   Event/EC_Scheduling_Strategy.h \
   Event/EC_SupplierAdmin.h \
   Event/EC_SupplierControl.h \
   Event/EC_Supplier_Filter.h \
-  Event/EC_Supplier_Filter.i \
+  Event/EC_Supplier_Filter.inl\
   Event/EC_Supplier_Filter_Builder.h \
   Event/EC_TPC_Dispatching.h \
   Event/EC_TPC_Dispatching_Task.h \
   Event/EC_TPC_Factory.h \
   Event/EC_TPC_ProxyConsumer.h \
   Event/EC_TPC_ProxySupplier.h \
-  Event/EC_TPC_ProxySupplier.i \
+  Event/EC_TPC_ProxySupplier.inl\
   Event/EC_Timeout_Filter.h \
-  Event/EC_Timeout_Filter.i \
+  Event/EC_Timeout_Filter.inl\
   Event/EC_Timeout_Generator.h \
-  Event/EC_Timeout_Generator.i \
+  Event/EC_Timeout_Generator.inl\
   Event/EC_Trivial_Supplier_Filter.h \
   Event/EC_Type_Filter.h \
   Event/EC_UDP_Admin.h
@@ -4999,14 +4999,14 @@ libTAO_HTIOP_la_LIBADD = \
 nobase_include_HEADERS += \
   HTIOP.idl \
   HTIOP/HTIOP_Acceptor.h \
-  HTIOP/HTIOP_Acceptor.i \
+  HTIOP/HTIOP_Acceptor.inl\
   HTIOP/HTIOP_Acceptor_Impl.h \
   HTIOP/HTIOP_Completion_Handler.h \
   HTIOP/HTIOP_Connection_Handler.h \
   HTIOP/HTIOP_Connector.h \
   HTIOP/HTIOP_Connector_Impl.h \
   HTIOP/HTIOP_Endpoint.h \
-  HTIOP/HTIOP_Endpoint.i \
+  HTIOP/HTIOP_Endpoint.inl\
   HTIOP/HTIOP_Factory.h \
   HTIOP/HTIOP_Profile.h \
   HTIOP/HTIOP_Transport.h \
@@ -5403,18 +5403,18 @@ nobase_include_HEADERS += \
   Runtime_Scheduler.h \
   Sched/Config_Scheduler.h \
   Sched/DynSched.h \
-  Sched/DynSched.i \
+  Sched/DynSched.inl\
   Sched/Reconfig_Sched_Utils.h \
   Sched/Reconfig_Sched_Utils_T.cpp \
   Sched/SchedEntry.h \
-  Sched/SchedEntry.i \
+  Sched/SchedEntry.inl\
   Sched/Scheduler.h \
   Sched/Scheduler_Generic.h \
   Sched/Strategy_Scheduler.h \
   Scheduler_Factory.h \
-  Scheduler_Factory.i \
+  Scheduler_Factory.inl\
   Scheduler_Utilities.h \
-  Scheduler_Utilities.i
+  Scheduler_Utilities.inl
 
 EXTRA_DIST += \
   RTSched.rc
@@ -5598,14 +5598,14 @@ libTAO_RTKokyuEvent_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Event/EC_Kokyu_Dispatching.h \
-  Event/EC_Kokyu_Dispatching.i \
+  Event/EC_Kokyu_Dispatching.inl\
   Event/EC_Kokyu_Factory.h \
-  Event/EC_Kokyu_Factory.i \
+  Event/EC_Kokyu_Factory.inl\
   Event/EC_Kokyu_Filter.h \
   Event/EC_Kokyu_Filter_Builder.h \
-  Event/EC_Kokyu_Filter_Builder.i \
+  Event/EC_Kokyu_Filter_Builder.inl\
   Event/EC_Kokyu_Scheduling.h \
-  Event/EC_Kokyu_Scheduling.i
+  Event/EC_Kokyu_Scheduling.inl
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
@@ -5657,12 +5657,12 @@ nobase_include_HEADERS += \
   Event/EC_Gateway_Sched.h \
   Event/EC_Priority_Dispatching.h \
   Event/EC_Priority_Scheduling.h \
-  Event/EC_Priority_Scheduling.i \
+  Event/EC_Priority_Scheduling.inl\
   Event/EC_Sched_Factory.h \
-  Event/EC_Sched_Factory.i \
+  Event/EC_Sched_Factory.inl\
   Event/EC_Sched_Filter.h \
   Event/EC_Sched_Filter_Builder.h \
-  Event/EC_Sched_Filter_Builder.i
+  Event/EC_Sched_Filter_Builder.inl
 
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
@@ -6113,10 +6113,10 @@ nobase_include_HEADERS += \
   SSLIOP/IIOP_SSL_Transport.h \
   SSLIOP/SSLIOP_Accept_Strategy.h \
   SSLIOP/SSLIOP_Acceptor.h \
-  SSLIOP/SSLIOP_Acceptor.i \
+  SSLIOP/SSLIOP_Acceptor.inl\
   SSLIOP/SSLIOP_ClientCredentials.h \
   SSLIOP/SSLIOP_Connection_Handler.h \
-  SSLIOP/SSLIOP_Connection_Handler.i \
+  SSLIOP/SSLIOP_Connection_Handler.inl\
   SSLIOP/SSLIOP_Connector.h \
   SSLIOP/SSLIOP_Credentials.h \
   SSLIOP/SSLIOP_Credentials.inl \
@@ -6128,7 +6128,7 @@ nobase_include_HEADERS += \
   SSLIOP/SSLIOP_Current_Impl.inl \
   SSLIOP/SSLIOP_EVP_PKEY.h \
   SSLIOP/SSLIOP_Endpoint.h \
-  SSLIOP/SSLIOP_Endpoint.i \
+  SSLIOP/SSLIOP_Endpoint.inl\
   SSLIOP/SSLIOP_Export.h \
   SSLIOP/SSLIOP_Factory.h \
   SSLIOP/SSLIOP_Invocation_Interceptor.h \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index 0ded4dafb07..9c913d77f7a 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -32,7 +32,7 @@ EC_Mcast_CPPFLAGS = \
 EC_Mcast_SOURCES = \
   EC_Mcast.cpp \
   EC_Mcast.h \
-  EC_Mcast.i
+  EC_Mcast.inl
 
 EC_Mcast_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am
index af04cdea2c4..5df44088400 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -42,7 +42,7 @@ noinst_HEADERS = \
   Counting_Consumer.h \
   Counting_Supplier.h \
   Driver.h \
-  Driver.i \
+  Driver.inl\
   Supplier.h \
   ectest_export.h
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
index 825e33eaade..39c535a40ff 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
@@ -65,7 +65,7 @@ client_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
@@ -94,7 +94,7 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
index 769f94456f8..3993d9dd02a 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
@@ -70,7 +70,7 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 client_LDFLAGS = \
  @ACE_TLS_LDFLAGS@
@@ -119,7 +119,7 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 server_LDFLAGS = \
  @ACE_TLS_LDFLAGS@
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
index 22357d5505c..030b9393b4b 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
@@ -67,7 +67,7 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   Client_Worker.h \
-  test_i.i
+  test_i.inl
 
 client_LDFLAGS = \
  @ACE_TLS_LDFLAGS@
@@ -105,7 +105,7 @@ server_SOURCES = \
   test_i.cpp \
   Server_Worker.h \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 server_LDFLAGS = \
  @ACE_TLS_LDFLAGS@
diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am
index fc85f48737a..773111daf43 100644
--- a/TAO/performance-tests/POA/Demux/Makefile.am
+++ b/TAO/performance-tests/POA/Demux/Makefile.am
@@ -63,7 +63,7 @@ client_SOURCES = \
   demux_testS.cpp \
   demux_test_client.cpp \
   demux_test_client.h \
-  demux_test_client.i
+  demux_test_client.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -90,7 +90,7 @@ server_SOURCES = \
   demux_test_i.cpp \
   demux_test_server.cpp \
   server.cpp \
-  demux_test_client.i \
+  demux_test_client.inl\
   demux_test_i.h \
   demux_test_server.h
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
index e2dd3262eaf..a6399dc7438 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
@@ -67,7 +67,7 @@ noinst_HEADERS = \
   testS.h \
   testS.inl \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
index fbe2b703e56..4dd4225fd1e 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
@@ -65,7 +65,7 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -102,7 +102,7 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   test_i.h \
-  test_i.i
+  test_i.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 7580b7f377a..65b1014352d 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -272,7 +272,7 @@ nobase_include_HEADERS = \
   Acceptor_Impl.cpp \
   Acceptor_Impl.h \
   Acceptor_Registry.h \
-  Acceptor_Registry.i \
+  Acceptor_Registry.inl\
   Adapter.h \
   Adapter_Factory.h \
   Adapter_Registry.h \
@@ -287,7 +287,7 @@ nobase_include_HEADERS = \
   Array_VarOut_T.inl \
   Asynch_Queued_Message.h \
   Asynch_Reply_Dispatcher_Base.h \
-  Asynch_Reply_Dispatcher_Base.i \
+  Asynch_Reply_Dispatcher_Base.inl\
   Auto_Functor.h \
   BD_String_Argument_T.cpp \
   BD_String_Argument_T.h \
@@ -301,7 +301,7 @@ nobase_include_HEADERS = \
   Basic_Types.h \
   BiDir_Adapter.h \
   Bind_Dispatcher_Guard.h \
-  Bind_Dispatcher_Guard.i \
+  Bind_Dispatcher_Guard.inl\
   Block_Flushing_Strategy.h \
   Blocked_Connect_Strategy.h \
   BooleanSeq.pidl \
@@ -320,14 +320,14 @@ nobase_include_HEADERS = \
   Buffer_Allocator_T.cpp \
   Buffer_Allocator_T.h \
   Buffering_Constraint_Policy.h \
-  Buffering_Constraint_Policy.i \
+  Buffering_Constraint_Policy.inl\
   CDR.h \
-  CDR.i \
+  CDR.inl\
   CONV_FRAME.pidl \
   CONV_FRAMEC.h \
   CONV_FRAMES.h \
   CORBALOC_Parser.h \
-  CORBALOC_Parser.i \
+  CORBALOC_Parser.inl\
   CORBANAME_Parser.h \
   CORBA_String.h \
   CORBA_String.inl \
@@ -361,7 +361,7 @@ nobase_include_HEADERS = \
   Connector_Impl.cpp \
   Connector_Impl.h \
   Connector_Registry.h \
-  Connector_Registry.i \
+  Connector_Registry.inl\
   Current.pidl \
   CurrentC.h \
   CurrentS.h \
@@ -379,17 +379,17 @@ nobase_include_HEADERS = \
   DoubleSeqS.h \
   Dynamic_Adapter.h \
   Endpoint.h \
-  Endpoint.i \
+  Endpoint.inl\
   Endpoint_Selector_Factory.h \
   Environment.h \
-  Environment.i \
+  Environment.inl\
   Exception.h \
-  Exception.i \
+  Exception.inl\
   Exception_Data.h \
   Exclusive_TMS.h \
   FILE_Parser.h \
   Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
+  Fault_Tolerance_Service.inl\
   Fixed_Array_Argument_T.cpp \
   Fixed_Array_Argument_T.h \
   Fixed_Array_Argument_T.inl \
@@ -414,7 +414,7 @@ nobase_include_HEADERS = \
   GIOP_Message_Generator_Parser_Impl.inl \
   GIOP_Message_Lite.h \
   GIOP_Message_Locate_Header.h \
-  GIOP_Message_Locate_Header.i \
+  GIOP_Message_Locate_Header.inl\
   GIOP_Message_State.h \
   GIOP_Message_State.inl \
   GIOP_Message_Version.h \
@@ -426,11 +426,11 @@ nobase_include_HEADERS = \
   IIOP.pidl \
   IIOPC.h \
   IIOP_Acceptor.h \
-  IIOP_Acceptor.i \
+  IIOP_Acceptor.inl\
   IIOP_Connection_Handler.h \
   IIOP_Connector.h \
   IIOP_Endpoint.h \
-  IIOP_Endpoint.i \
+  IIOP_Endpoint.inl\
   IIOP_Endpoints.pidl \
   IIOP_EndpointsC.h \
   IIOP_Factory.h \
@@ -483,10 +483,10 @@ nobase_include_HEADERS = \
   LF_Strategy_Complete.h \
   LRU_Connection_Purging_Strategy.h \
   Leader_Follower.h \
-  Leader_Follower.i \
+  Leader_Follower.inl\
   Leader_Follower_Flushing_Strategy.h \
   LocalObject.h \
-  LocalObject.i \
+  LocalObject.inl\
   LocateRequest_Invocation.h \
   LocateRequest_Invocation_Adapter.h \
   LongDoubleSeq.pidl \
@@ -499,10 +499,10 @@ nobase_include_HEADERS = \
   LongSeqC.h \
   LongSeqS.h \
   MCAST_Parser.h \
-  MCAST_Parser.i \
+  MCAST_Parser.inl\
   MMAP_Allocator.h \
   MProfile.h \
-  MProfile.i \
+  MProfile.inl\
   Messaging_PolicyValue.pidl \
   Messaging_PolicyValueC.h \
   Messaging_SyncScope.pidl \
@@ -512,19 +512,19 @@ nobase_include_HEADERS = \
   New_Leader_Generator.h \
   Null_Fragmentation_Strategy.h \
   ORB.h \
-  ORB.i \
+  ORB.inl\
   ORBInitializer_Registry.h \
   ORBInitializer_Registry_Adapter.h \
   ORB_Constants.h \
   ORB_Core.h \
-  ORB_Core.i \
+  ORB_Core.inl\
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
   ORB_Core_TSS_Resources.h \
   ORB_Table.h \
   ORB_Table.inl \
   Object.h \
-  Object.i \
+  Object.inl\
   ObjectIdList.pidl \
   ObjectIdListC.h \
   ObjectKey_Table.h \
@@ -554,10 +554,10 @@ nobase_include_HEADERS = \
   ParameterModeC.h \
   ParameterModeS.h \
   Parser_Registry.h \
-  Parser_Registry.i \
+  Parser_Registry.inl\
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
+  Pluggable_Messaging_Utils.inl\
   Policy.pidl \
   PolicyC.h \
   PolicyC.inl \
@@ -572,18 +572,18 @@ nobase_include_HEADERS = \
   Policy_ForwardC.h \
   Policy_ForwardS.h \
   Policy_Manager.h \
-  Policy_Manager.i \
+  Policy_Manager.inl\
   Policy_Set.h \
-  Policy_Set.i \
+  Policy_Set.inl\
   Policy_Validator.h \
   PortableInterceptor.h \
   PortableInterceptor.pidl \
   PortableInterceptorC.h \
   PortableInterceptorS.h \
   Principal.h \
-  Principal.i \
+  Principal.inl\
   Profile.h \
-  Profile.i \
+  Profile.inl\
   Profile_Transport_Resolver.h \
   Profile_Transport_Resolver.inl \
   Protocol_Factory.h \
@@ -600,7 +600,7 @@ nobase_include_HEADERS = \
   Remote_Invocation.h \
   Remote_Object_Proxy_Broker.h \
   Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
+  Reply_Dispatcher.inl\
   Request_Dispatcher.h \
   Resource_Factory.h \
   Resume_Handle.h \
@@ -638,7 +638,7 @@ nobase_include_HEADERS = \
   String_Traits_Base_T.h \
   String_Traits_T.h \
   Stub.h \
-  Stub.i \
+  Stub.inl\
   Stub_Factory.h \
   Synch_Invocation.h \
   Synch_Invocation.inl \
@@ -652,7 +652,7 @@ nobase_include_HEADERS = \
   TAO_Export.h \
   TAO_Internal.h \
   TAO_Server_Request.h \
-  TAO_Server_Request.i \
+  TAO_Server_Request.inl\
   TAO_Singleton.cpp \
   TAO_Singleton.h \
   TAO_Singleton.inl \
@@ -660,9 +660,9 @@ nobase_include_HEADERS = \
   TAO_Singleton_Manager.inl \
   TSS_Resources.h \
   Tagged_Components.h \
-  Tagged_Components.i \
+  Tagged_Components.inl\
   Tagged_Profile.h \
-  Tagged_Profile.i \
+  Tagged_Profile.inl\
   Thread_Lane_Resources.h \
   Thread_Lane_Resources_Manager.h \
   Thread_Per_Connection_Handler.h \
@@ -752,16 +752,16 @@ nobase_include_HEADERS = \
   default_server.h \
   objectid.h \
   operation_details.h \
-  operation_details.i \
+  operation_details.inl\
   orb.idl \
   orb_types.pidl \
   orb_typesC.h \
   orb_typesS.h \
   orbconf.h \
   params.h \
-  params.i \
+  params.inl\
   target_specification.h \
-  target_specification.i \
+  target_specification.inl\
   varbase.h
 
 pkgconfig_DATA = \
@@ -1947,7 +1947,7 @@ libTAO_PortableServer_la_LIBADD = \
 nobase_include_HEADERS += \
   PortableServer/Acceptor_Filter_Factory.h \
   PortableServer/Active_Object_Map.h \
-  PortableServer/Active_Object_Map.i \
+  PortableServer/Active_Object_Map.inl\
   PortableServer/Active_Object_Map_Entry.h \
   PortableServer/Active_Policy_Strategies.h \
   PortableServer/Active_Policy_Strategies.inl \
@@ -2033,7 +2033,7 @@ nobase_include_HEADERS += \
   PortableServer/ORT_Adapter.h \
   PortableServer/ORT_Adapter_Factory.h \
   PortableServer/Object_Adapter.h \
-  PortableServer/Object_Adapter.i \
+  PortableServer/Object_Adapter.inl\
   PortableServer/Object_Adapter_Factory.h \
   PortableServer/Object_SArg_Traits.h \
   PortableServer/Object_SArgument_T.cpp \
@@ -2048,7 +2048,7 @@ nobase_include_HEADERS += \
   PortableServer/POA.pidl \
   PortableServer/POAC.h \
   PortableServer/POAManager.h \
-  PortableServer/POAManager.i \
+  PortableServer/POAManager.inl\
   PortableServer/POAManager.pidl \
   PortableServer/POAManager.pidl \
   PortableServer/POAManagerC.h \
@@ -2057,14 +2057,14 @@ nobase_include_HEADERS += \
   PortableServer/POAManagerFactory.pidl \
   PortableServer/POAManagerFactoryC.h \
   PortableServer/POA_Cached_Policies.h \
-  PortableServer/POA_Cached_Policies.i \
+  PortableServer/POA_Cached_Policies.inl\
   PortableServer/POA_Current.h \
   PortableServer/POA_Current_Factory.h \
   PortableServer/POA_Current_Impl.h \
   PortableServer/POA_Current_Impl.inl \
   PortableServer/POA_Guard.h \
   PortableServer/POA_Policy_Set.h \
-  PortableServer/POA_Policy_Set.i \
+  PortableServer/POA_Policy_Set.inl\
   PortableServer/PS_Current.pidl \
   PortableServer/PS_Current.pidl \
   PortableServer/PS_CurrentC.h \
@@ -2133,7 +2133,7 @@ nobase_include_HEADERS += \
   PortableServer/ServantRetentionStrategyRetain.h \
   PortableServer/ServantRetentionStrategyRetainFactoryImpl.h \
   PortableServer/Servant_Base.h \
-  PortableServer/Servant_Base.i \
+  PortableServer/Servant_Base.inl\
   PortableServer/Servant_Dispatcher.h \
   PortableServer/Servant_Location.h \
   PortableServer/Servant_Upcall.h \
@@ -2876,7 +2876,7 @@ nobase_include_HEADERS += \
   Messaging/Messaging_ORBInitializer.h \
   Messaging/Messaging_PolicyFactory.h \
   Messaging/Messaging_Policy_i.h \
-  Messaging/Messaging_Policy_i.i \
+  Messaging/Messaging_Policy_i.inl\
   Messaging/Messaging_RT_Policy.pidl \
   Messaging/Messaging_RT_Policy.pidl \
   Messaging/Messaging_RT_PolicyA.h \
@@ -3568,10 +3568,10 @@ nobase_include_HEADERS += \
   RTCORBA/Multi_Priority_Mapping.h \
   RTCORBA/Network_Priority_Mapping.h \
   RTCORBA/Network_Priority_Mapping_Manager.h \
-  RTCORBA/Network_Priority_Mapping_Manager.i \
+  RTCORBA/Network_Priority_Mapping_Manager.inl\
   RTCORBA/Priority_Mapping.h \
   RTCORBA/Priority_Mapping_Manager.h \
-  RTCORBA/Priority_Mapping_Manager.i \
+  RTCORBA/Priority_Mapping_Manager.inl\
   RTCORBA/RTCORBA.h \
   RTCORBA/RTCORBA.pidl \
   RTCORBA/RTCORBAC.h \
@@ -3666,7 +3666,7 @@ nobase_include_HEADERS += \
   RTPortableServer/RT_Collocation_Resolver.h \
   RTPortableServer/RT_Object_Adapter_Factory.h \
   RTPortableServer/RT_POA.h \
-  RTPortableServer/RT_POA.i \
+  RTPortableServer/RT_POA.inl\
   RTPortableServer/RT_Policy_Validator.h \
   RTPortableServer/RT_Servant_Dispatcher.h \
   RTPortableServer/rtportableserver_export.h
@@ -3734,7 +3734,7 @@ nobase_include_HEADERS += \
   RTScheduling/RTScheduler_Initializer.h \
   RTScheduling/RTScheduler_Loader.h \
   RTScheduling/RTScheduler_Manager.h \
-  RTScheduling/RTScheduler_Manager.i \
+  RTScheduling/RTScheduler_Manager.inl\
   RTScheduling/RTScheduler_include.pidl \
   RTScheduling/RTScheduler_includeA.h \
   RTScheduling/RTScheduler_includeC.h \
@@ -3865,11 +3865,11 @@ libTAO_Strategies_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Strategies/DIOP_Acceptor.h \
-  Strategies/DIOP_Acceptor.i \
+  Strategies/DIOP_Acceptor.inl\
   Strategies/DIOP_Connection_Handler.h \
   Strategies/DIOP_Connector.h \
   Strategies/DIOP_Endpoint.h \
-  Strategies/DIOP_Endpoint.i \
+  Strategies/DIOP_Endpoint.inl\
   Strategies/DIOP_Factory.h \
   Strategies/DIOP_Profile.h \
   Strategies/DIOP_Transport.h \
@@ -3882,11 +3882,11 @@ nobase_include_HEADERS += \
   Strategies/OC_Endpoint_Selector_Loader.h \
   Strategies/Optimized_Connection_Endpoint_Selector.h \
   Strategies/SCIOP_Acceptor.h \
-  Strategies/SCIOP_Acceptor.i \
+  Strategies/SCIOP_Acceptor.inl\
   Strategies/SCIOP_Connection_Handler.h \
   Strategies/SCIOP_Connector.h \
   Strategies/SCIOP_Endpoint.h \
-  Strategies/SCIOP_Endpoint.i \
+  Strategies/SCIOP_Endpoint.inl\
   Strategies/SCIOP_Factory.h \
   Strategies/SCIOP_Lite_Factory.h \
   Strategies/SCIOP_Profile.h \
@@ -3895,7 +3895,7 @@ nobase_include_HEADERS += \
   Strategies/SHMIOP_Connection_Handler.h \
   Strategies/SHMIOP_Connector.h \
   Strategies/SHMIOP_Endpoint.h \
-  Strategies/SHMIOP_Endpoint.i \
+  Strategies/SHMIOP_Endpoint.inl\
   Strategies/SHMIOP_Factory.h \
   Strategies/SHMIOP_Profile.h \
   Strategies/SHMIOP_Transport.h \
@@ -3903,7 +3903,7 @@ nobase_include_HEADERS += \
   Strategies/UIOP_Connection_Handler.h \
   Strategies/UIOP_Connector.h \
   Strategies/UIOP_Endpoint.h \
-  Strategies/UIOP_Endpoint.i \
+  Strategies/UIOP_Endpoint.inl\
   Strategies/UIOP_Factory.h \
   Strategies/UIOP_Lite_Factory.h \
   Strategies/UIOP_Profile.h \