530 files changed, 654 insertions, 654 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 1b22b453ab0..bc17023b8fb 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -24,7 +24,7 @@
 #include "ace/OS_TLI.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ACE.i"
+#include "ace/ACE.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
diff --git a/ace/ACE.h b/ace/ACE.h
index a45281b7829..ac389a9e7f3 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -784,7 +784,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ACE.i"
+#include "ace/ACE.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (acelog2)
diff --git a/ace/ACE.i b/ace/ACE.inl
index 9e28d4ea321..9e28d4ea321 100644
--- a/ace/ACE.i
+++ b/ace/ACE.inl
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index a38f09eccdd..16f8ee14dc2 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -6,7 +6,7 @@
 #include "ace/ARGV.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ARGV.i"
+#include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 9533a0b7368..e43ae3a719b 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -176,7 +176,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ARGV.i"
+#include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/ARGV.i b/ace/ARGV.inl
index 00c465f6250..00c465f6250 100644
--- a/ace/ARGV.i
+++ b/ace/ARGV.inl
diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp
index 65db53062dc..41273857113 100644
--- a/ace/ATM_Acceptor.cpp
+++ b/ace/ATM_Acceptor.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(ace, ATM_Acceptor, "$Id$")
 #endif /* ACE_HAS_LINUX_ATM */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_Acceptor.i"
+#include "ace/ATM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 // Put the actual definitions of the ACE_ATM_Request and
diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index aac2121c5b1..6305013601f 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -104,7 +104,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_Acceptor.i"
+#include "ace/ATM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Acceptor.i b/ace/ATM_Acceptor.inl
index ba0630dd6d6..ba0630dd6d6 100644
--- a/ace/ATM_Acceptor.i
+++ b/ace/ATM_Acceptor.inl
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index 4bcc83fe5e6..189c67dfeef 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -12,7 +12,7 @@
 #endif /* ACE_HAS_FORE_ATM_WS2 */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_Addr.i"
+#include "ace/ATM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, ATM_Addr, "$Id$")
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index 574d180f310..f498d12baf4 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -178,7 +178,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_Addr.i"
+#include "ace/ATM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.inl
index 48823c1ec81..48823c1ec81 100644
--- a/ace/ATM_Addr.i
+++ b/ace/ATM_Addr.inl
diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp
index 4dbda277787..07811ffc264 100644
--- a/ace/ATM_Connector.cpp
+++ b/ace/ATM_Connector.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID(ace, ATM_Connector, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_Connector.i"
+#include "ace/ATM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector)
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index 24137ad091a..151f3e9978b 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -150,7 +150,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_Connector.i"
+#include "ace/ATM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Connector.i b/ace/ATM_Connector.inl
index 50bde9ce55f..50bde9ce55f 100644
--- a/ace/ATM_Connector.i
+++ b/ace/ATM_Connector.inl
diff --git a/ace/ATM_Params.cpp b/ace/ATM_Params.cpp
index a8a84f66ec7..1777616858d 100644
--- a/ace/ATM_Params.cpp
+++ b/ace/ATM_Params.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(ace, ATM_Params, "$Id$")
 #if defined (ACE_HAS_ATM)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_Params.i"
+#include "ace/ATM_Params.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Params)
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index 2175f8889b7..1056c1bb728 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -202,7 +202,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_Params.i"
+#include "ace/ATM_Params.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Params.i b/ace/ATM_Params.inl
index 4006d4d00b5..4006d4d00b5 100644
--- a/ace/ATM_Params.i
+++ b/ace/ATM_Params.inl
diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp
index cf69d373d2d..6d713cf8579 100644
--- a/ace/ATM_QoS.cpp
+++ b/ace/ATM_QoS.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(ace, ATM_QoS, "$Id$")
 #if defined (ACE_HAS_ATM)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_QoS.i"
+#include "ace/ATM_QoS.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2)
@@ -66,9 +66,9 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
 
   // Setting up cbr parameters ...
   ie_aalparams.AALType = AALTYPE_5;
-  ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize 
+  ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize
     = pktSize; // was 1516;
-  ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize 
+  ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize
     = pktSize; // was 1516;
   ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE;
   ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL;
@@ -93,8 +93,8 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
 
   ie_td.BestEffort = 0; // Note: this must be set to zero for CBR.
 
-  size += sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  size += sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( ATM_TRAFFIC_DESCRIPTOR_IE );
 
   ie_bbc.BearerClass = BCOB_X;
@@ -103,12 +103,12 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
   ie_bbc.ClippingSusceptability = CLIP_NOT;
   ie_bbc.UserPlaneConnectionConfig = UP_P2P;
 
-  size += sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  size += sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE );
 
   ie_qos.QOSClassForward = QOS_CLASS1;
-  ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used 
+  ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used
   // since we do only simplex data xfer.
 
   size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE);
@@ -125,31 +125,31 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
 
   ie_ptr = (Q2931_IE *) qos_.ProviderSpecific.buf;
   ie_ptr->IEType = IE_AALParameters;
-  ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  ie_ptr->IELength = sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( AAL_PARAMETERS_IE );
   ACE_OS::memcpy(ie_ptr->IE, &ie_aalparams, sizeof(AAL_PARAMETERS_IE));
 
   ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
   ie_ptr->IEType = IE_TrafficDescriptor;
-  ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  ie_ptr->IELength = sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( ATM_TRAFFIC_DESCRIPTOR_IE );
   ACE_OS::memcpy(ie_ptr->IE, &ie_td, sizeof(ATM_TRAFFIC_DESCRIPTOR_IE));
 
   ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
   ie_ptr->IEType = IE_BroadbandBearerCapability;
-  ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  ie_ptr->IELength = sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE );
-  ACE_OS::memcpy(ie_ptr->IE, 
-                 &ie_bbc, 
+  ACE_OS::memcpy(ie_ptr->IE,
+                 &ie_bbc,
                  sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE));
 
   ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
   ie_ptr->IEType = IE_QOSClass;
-  ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) 
-    + sizeof( ULONG ) 
+  ie_ptr->IELength = sizeof( Q2931_IE_TYPE )
+    + sizeof( ULONG )
     + sizeof( ATM_QOS_CLASS_IE );
   ACE_OS::memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE));
 
@@ -158,7 +158,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
   //	qos_.SendingFlowspec.PeakBandwidth = 0xffffffff;
   //	qos_.SendingFlowspec.Latency = 0xffffffff;
   //	qos_.SendingFlowspec.DelayVariation = 0xffffffff;
-  //	qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; 
+  //	qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
   //	qos_.SendingFlowspec.MaxSduSize = 0xffffffff;
   //	qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff;
@@ -168,7 +168,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
   //	qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff;
   //	qos_.ReceivingFlowspec.Latency = 0xffffffff;
   //	qos_.ReceivingFlowspec.DelayVariation = 0xffffffff;
-  //	qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; 
+  //	qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
   //	qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff;
   //	qos_.ReceivingFlowspec.MinimumPolicedSize = 0;
@@ -178,7 +178,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
                             0xffffffff,
                             0xffffffff,
                             0xffffffff,
-                            SERVICETYPE_BESTEFFORT, 
+                            SERVICETYPE_BESTEFFORT,
                             // This will most probably ignored by SP.
                             0xffffffff,
                             0xffffffff,
@@ -189,7 +189,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
                 0xffffffff,
                 0xffffffff,
                 0xffffffff,
-                SERVICETYPE_BESTEFFORT, 
+                SERVICETYPE_BESTEFFORT,
                 // This will most probably ignored by SP.
                 0xffffffff,
                 0,
@@ -209,10 +209,10 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
   qos_.rxtp.max_sdu = pktSize;
 
   if (rate > 0) {
-    qos_.rxtp.pcr = rate;  
+    qos_.rxtp.pcr = rate;
     qos_.rxtp.traffic_class = ATM_CBR;
     qos_.txtp.traffic_class = ATM_CBR;
-    qos_.txtp.pcr = rate;   
+    qos_.txtp.pcr = rate;
   }
   else {
     qos_.rxtp.traffic_class = ATM_UBR;
@@ -246,9 +246,9 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   /*
   FORE has changed this - we no longer specify QoS this way
   ie_aalparams.AALType = AALTYPE_5;
-  ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize 
+  ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize
     = pktSize; // was 1516;
-  ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize 
+  ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize
     = pktSize; // was 1516;
   ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE;
   ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL;
@@ -288,7 +288,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
           sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE);
 
   ie_qos.QOSClassForward = QOS_CLASS1;
-  ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used 
+  ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used
   // since we only simplex data xfer.
 
   size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE);
@@ -322,8 +322,8 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) +
                      sizeof( ULONG ) +
                      sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE );
-  ACE_OS::memcpy( ie_ptr->IE, 
-                  &ie_bbc, 
+  ACE_OS::memcpy( ie_ptr->IE,
+                  &ie_bbc,
                   sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE ));
 
   ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
@@ -358,7 +358,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   //qos_.SendingFlowspec.PeakBandwidth = 0xffffffff;
   //qos_.SendingFlowspec.Latency = 0xffffffff;
   //qos_.SendingFlowspec.DelayVariation = 0xffffffff;
-  //qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; 
+  //qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
   //qos_.SendingFlowspec.MaxSduSize = 0xffffffff;
   //qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff;
@@ -368,7 +368,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   //qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff;
   //qos_.ReceivingFlowspec.Latency = 0xffffffff;
   //qos_.ReceivingFlowspec.DelayVariation = 0xffffffff;
-  //qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; 
+  //qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
   //qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff;
   //qos_.ReceivingFlowspec.MinimumPolicedSize = 0;
@@ -407,9 +407,9 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   ACE_UNUSED_ARG (pktSize);
 
   qos_.rxtp.traffic_class = ATM_CBR;
-  qos_.rxtp.pcr = rate;    
+  qos_.rxtp.pcr = rate;
   qos_.txtp.traffic_class = ATM_CBR;
-  qos_.txtp.pcr = rate;    
+  qos_.txtp.pcr = rate;
 #else
   ACE_UNUSED_ARG (rate);
 #endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_FORE_ATM_XTI || ACE_HAS_LINUX_ATM */
@@ -423,7 +423,7 @@ ACE_ATM_QoS::set_rate (ACE_HANDLE fd,
   ACE_TRACE ("ACE_ATM_QoS::set_rate");
 #if defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM)
   set_cbr_rate( rate );
-  
+
   ACE_UNUSED_ARG( fd );
   ACE_UNUSED_ARG( flags );
 #elif defined (ACE_HAS_FORE_ATM_XTI)
@@ -483,7 +483,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       popt->name = T_ATM_ORIG_ADDR;
       popt->status = 0;
 
-      source_addr = 
+      source_addr =
         (t_atm_addr *)((char *) popt + sizeof (struct t_opthdr));
 
       source_addr->address_format = T_ATM_ENDSYS_ADDR;
@@ -523,7 +523,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
 
   qos_cells = (rate * 1000) / (48*8);
 
-  if ((qos_cells > 0 && qos_cells < LINE_RATE) 
+  if ((qos_cells > 0 && qos_cells < LINE_RATE)
       || (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)))
     {
       struct t_atm_bearer *bearer;
@@ -576,8 +576,8 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       traffic->forward.tagging = T_NO;
 
       traffic->backward.PCR_high_priority = T_ATM_ABSENT;
-      traffic->backward.PCR_all_traffic	= 
-        (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)) 
+      traffic->backward.PCR_all_traffic	=
+        (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP))
         ? 0 : qos_cells ? qos_cells : LINE_RATE;
       traffic->backward.SCR_high_priority = T_ATM_ABSENT;
       traffic->backward.SCR_all_traffic	= T_ATM_ABSENT;
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index b5a05972bbb..c29962d80fc 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -95,7 +95,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_QoS.i"
+#include "ace/ATM_QoS.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_QoS.i b/ace/ATM_QoS.inl
index ac5b7de890f..ac5b7de890f 100644
--- a/ace/ATM_QoS.i
+++ b/ace/ATM_QoS.inl
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp
index 6753783bbb8..898a627c694 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (ace, ATM_Stream, "$Id$")
 #if defined (ACE_HAS_ATM)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/ATM_Stream.i"
+#include "ace/ATM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE (ACE_ATM_Stream)
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index e1afa0508ef..7741eeab366 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -91,7 +91,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/ATM_Stream.i"
+#include "ace/ATM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Stream.i b/ace/ATM_Stream.inl
index 9c11fd93b7c..9c11fd93b7c 100644
--- a/ace/ATM_Stream.i
+++ b/ace/ATM_Stream.inl
diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp
index b8ca36e00db..ffb8e797020 100644
--- a/ace/Activation_Queue.cpp
+++ b/ace/Activation_Queue.cpp
@@ -1,7 +1,7 @@
 #include "ace/Activation_Queue.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Activation_Queue.i"
+#include "ace/Activation_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index 4557e248c67..e1246a37125 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -155,7 +155,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Activation_Queue.i"
+#include "ace/Activation_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Activation_Queue.i b/ace/Activation_Queue.inl
index b4b9283bced..b4b9283bced 100644
--- a/ace/Activation_Queue.i
+++ b/ace/Activation_Queue.inl
diff --git a/ace/Active_Map_Manager.cpp b/ace/Active_Map_Manager.cpp
index a01fb45d9b0..47e734d044d 100644
--- a/ace/Active_Map_Manager.cpp
+++ b/ace/Active_Map_Manager.cpp
@@ -5,6 +5,6 @@
 ACE_RCSID(ace, Active_Map_Manager, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Active_Map_Manager.i"
+#include "ace/Active_Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 4df059fc9a9..62cf0b310f5 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -102,7 +102,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Active_Map_Manager.i"
+#include "ace/Active_Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 // Include the templates here.
diff --git a/ace/Active_Map_Manager.i b/ace/Active_Map_Manager.inl
index 491b25430b7..491b25430b7 100644
--- a/ace/Active_Map_Manager.i
+++ b/ace/Active_Map_Manager.inl
diff --git a/ace/Active_Map_Manager_T.cpp b/ace/Active_Map_Manager_T.cpp
index a544bc28fda..b4fbf30cfa5 100644
--- a/ace/Active_Map_Manager_T.cpp
+++ b/ace/Active_Map_Manager_T.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Active_Map_Manager_T.i"
+#include "ace/Active_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Active_Map_Manager_T, "$Id$")
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index 6aca3966ab2..f3e90b3f744 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -192,7 +192,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Active_Map_Manager_T.i"
+#include "ace/Active_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.inl
index fd9ff0df6c6..fd9ff0df6c6 100644
--- a/ace/Active_Map_Manager_T.i
+++ b/ace/Active_Map_Manager_T.inl
diff --git a/ace/Addr.cpp b/ace/Addr.cpp
index 0c31a45170b..eaf755de8d1 100644
--- a/ace/Addr.cpp
+++ b/ace/Addr.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(ace, Addr, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Addr.i"
+#include "ace/Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Addr.h b/ace/Addr.h
index d68669a93ef..654b1fc4355 100644
--- a/ace/Addr.h
+++ b/ace/Addr.h
@@ -92,7 +92,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Addr.i"
+#include "ace/Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Addr.i b/ace/Addr.inl
index 95b90655bd9..95b90655bd9 100644
--- a/ace/Addr.i
+++ b/ace/Addr.inl
diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp
index b8cd305a2b9..8b52d7eab9a 100644
--- a/ace/Asynch_IO_Impl.cpp
+++ b/ace/Asynch_IO_Impl.cpp
@@ -4,10 +4,10 @@
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
-// aio calls. 
+// aio calls.
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
+#include "ace/Asynch_IO_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl (void)
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index cb0c79ea92e..c1ad52825b6 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -241,7 +241,7 @@ public:
                       int priority,
                       int signal_number) = 0;
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
-  
+
 protected:
   /// Do-nothing constructor.
   ACE_Asynch_Write_Stream_Impl (void);
@@ -305,7 +305,7 @@ public:
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system 
+  * NOTE: In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   virtual int readv (ACE_Message_Block &message_block,
@@ -394,7 +394,7 @@ public:
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system 
+  * NOTE: In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   virtual int writev (ACE_Message_Block &message_block,
@@ -666,10 +666,10 @@ public:
    * errno to get the error code.
    *
    * Scatter/gather is supported on WIN32 by using the <message_block->cont()>
-   * method.  Up to ACE_IOV_MAX <message_block>'s are supported.  Upto 
+   * method.  Up to ACE_IOV_MAX <message_block>'s are supported.  Upto
    * <message_block->size()> bytes will be read into each <message block> for
    * a total of <message_block->total_size()> bytes.  All <message_block>'s
-   * <wr_ptr>'s will be updated to reflect the added bytes for each 
+   * <wr_ptr>'s will be updated to reflect the added bytes for each
    * <message_block>
    *
    * Priority of the operation is specified by <priority>. On POSIX4-Unix,
@@ -742,7 +742,7 @@ public:
   virtual ~ACE_Asynch_Write_Dgram_Impl (void);
 
   /** This starts off an asynchronous send.  Upto
-   * <message_block->total_length()> will be sent.  <message_block>'s 
+   * <message_block->total_length()> will be sent.  <message_block>'s
    * <rd_ptr> will be updated to reflect the sent bytes if the send operation
    * is successful completed.
    * Return code of 1 means immediate success and <number_of_bytes_sent>
@@ -752,7 +752,7 @@ public:
    * errno to get the error code.
    *
    * Scatter/gather is supported on WIN32 by using the <message_block->cont()>
-   * method.  Up to ACE_IOV_MAX <message_block>'s are supported.  Upto 
+   * method.  Up to ACE_IOV_MAX <message_block>'s are supported.  Upto
    * <message_block->length()> bytes will be sent from each <message block>
    * for a total of <message_block->total_length()> bytes.  All
    * <message_block>'s <rd_ptr>'s will be updated to reflect the bytes sent
@@ -812,7 +812,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
+#include "ace/Asynch_IO_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS  || !ACE_HAS_WINCE && ACE_WIN32 */
diff --git a/ace/Asynch_IO_Impl.i b/ace/Asynch_IO_Impl.inl
index 3d61fae7942..3d61fae7942 100644
--- a/ace/Asynch_IO_Impl.i
+++ b/ace/Asynch_IO_Impl.inl
diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp
index 3aec838b006..f6494b30411 100644
--- a/ace/Atomic_Op.cpp
+++ b/ace/Atomic_Op.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (ace,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Atomic_Op.i"
+#include "ace/Atomic_Op.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_BUILTIN_ATOMIC_OP)
diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h
index caea5817def..ee0c330bf4a 100644
--- a/ace/Atomic_Op.h
+++ b/ace/Atomic_Op.h
@@ -155,7 +155,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Atomic_Op.i"
+#include "ace/Atomic_Op.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.inl
index 6194d8a7318..6194d8a7318 100644
--- a/ace/Atomic_Op.i
+++ b/ace/Atomic_Op.inl
diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp
index 41436069852..7b04d7e510f 100644
--- a/ace/Atomic_Op_T.cpp
+++ b/ace/Atomic_Op_T.cpp
@@ -9,7 +9,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Atomic_Op_T.i"
+#include "ace/Atomic_Op_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/Atomic_Op_T.h b/ace/Atomic_Op_T.h
index 65f57f70a6d..f536a349662 100644
--- a/ace/Atomic_Op_T.h
+++ b/ace/Atomic_Op_T.h
@@ -236,7 +236,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Atomic_Op_T.i"
+#include "ace/Atomic_Op_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Atomic_Op_T.i b/ace/Atomic_Op_T.inl
index ccdfee63905..ccdfee63905 100644
--- a/ace/Atomic_Op_T.i
+++ b/ace/Atomic_Op_T.inl
diff --git a/ace/Auto_IncDec_T.cpp b/ace/Auto_IncDec_T.cpp
index 59a833e2303..c4e689e3ab2 100644
--- a/ace/Auto_IncDec_T.cpp
+++ b/ace/Auto_IncDec_T.cpp
@@ -13,7 +13,7 @@
 ACE_RCSID(ace, Auto_IncDec_T, "Auto_IncDec_T.cpp, by Edan Ayal")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Auto_IncDec_T.i"
+#include "ace/Auto_IncDec_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_IncDec)
diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h
index ff8b687e4dd..a9092c7c122 100644
--- a/ace/Auto_IncDec_T.h
+++ b/ace/Auto_IncDec_T.h
@@ -63,7 +63,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Auto_IncDec_T.i"
+#include "ace/Auto_IncDec_T.inl"
 // On non-Win32 platforms, this code will be inlined
 #endif /* __ACE_INLINE__ */
 
diff --git a/ace/Auto_IncDec_T.i b/ace/Auto_IncDec_T.inl
index 96658ed76c5..96658ed76c5 100644
--- a/ace/Auto_IncDec_T.i
+++ b/ace/Auto_IncDec_T.inl
diff --git a/ace/Auto_Ptr.cpp b/ace/Auto_Ptr.cpp
index 9055a913d3e..9c2827504c9 100644
--- a/ace/Auto_Ptr.cpp
+++ b/ace/Auto_Ptr.cpp
@@ -7,7 +7,7 @@
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Auto_Ptr.i"
+#include "ace/Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Auto_Ptr, "$Id$")
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 414002ad522..ab56839c2c3 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -166,7 +166,7 @@ public:
 # endif /* ACE_AUTO_PTR_LACKS_RESET */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Auto_Ptr.i"
+#include "ace/Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.inl
index d891930000e..d891930000e 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.inl
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
index de3e9779e08..c648d28834f 100644
--- a/ace/Based_Pointer_T.cpp
+++ b/ace/Based_Pointer_T.cpp
@@ -10,7 +10,7 @@
 #   define ACE_TRACEX(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__))
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Based_Pointer_T.i"
+#include "ace/Based_Pointer_T.inl"
 #endif /* __ACE_INLINE__ */
 
 template <class CONCRETE>
@@ -28,7 +28,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntarget_ = %d\n"), this->target_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_offset_ = %d\n"), this->base_offset_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), 
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"),
               (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index e94bfceda58..91ebfc778cd 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -185,7 +185,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Based_Pointer_T.i"
+#include "ace/Based_Pointer_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.inl
index 28272f8a861..28272f8a861 100644
--- a/ace/Based_Pointer_T.i
+++ b/ace/Based_Pointer_T.inl
diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp
index ecd1051b3fb..d2a160c1851 100644
--- a/ace/Basic_Types.cpp
+++ b/ace/Basic_Types.cpp
@@ -1,7 +1,7 @@
 #include "ace/Basic_Types.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Basic_Types.i"
+# include "ace/Basic_Types.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 155286a1b96..169387bc503 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -656,7 +656,7 @@ typedef ptrdiff_t ptr_arith_t;
 #define ACE_DBL_MAX 1.7976931348623158e+308
 
 # if defined (__ACE_INLINE__)
-#   include "ace/Basic_Types.i"
+#   include "ace/Basic_Types.inl"
 # endif /* __ACE_INLINE__ */
 
 # include /**/ "ace/post.h"
diff --git a/ace/Basic_Types.i b/ace/Basic_Types.inl
index b7deb43b71b..b7deb43b71b 100644
--- a/ace/Basic_Types.i
+++ b/ace/Basic_Types.inl
diff --git a/ace/Bound_Ptr.h b/ace/Bound_Ptr.h
index 2a46d7a7734..833ab3fe84e 100644
--- a/ace/Bound_Ptr.h
+++ b/ace/Bound_Ptr.h
@@ -333,7 +333,7 @@ private:
   X *ptr_;
 };
 
-#include "ace/Bound_Ptr.i"
+#include "ace/Bound_Ptr.inl"
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Bound_Ptr.i b/ace/Bound_Ptr.inl
index f95b7c94f59..f95b7c94f59 100644
--- a/ace/Bound_Ptr.i
+++ b/ace/Bound_Ptr.inl
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 520ca24bea0..8bdcb9d0eba 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -1,7 +1,7 @@
 #include "ace/CDR_Stream.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/CDR_Stream.i"
+# include "ace/CDR_Stream.inl"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/SString.h"
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index c64209f66cb..18641409074 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -1161,7 +1161,7 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
 
 
 #if defined (__ACE_INLINE__)
-# include "ace/CDR_Stream.i"
+# include "ace/CDR_Stream.inl"
 #else /* __ACE_INLINE__ */
 
 // Not used by CORBA or TAO
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.inl
index e20f87551eb..e20f87551eb 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.inl
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index ce7d53dc032..73be673aac6 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -13,7 +13,7 @@
 #include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Cache_Map_Manager_T.i"
+#include "ace/Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 207325d3973..cd981a8d702 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -385,7 +385,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Cache_Map_Manager_T.i"
+#include "ace/Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.inl
index 922587fd81c..922587fd81c 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.inl
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index 0d4f389c966..84e3450c894 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -7,7 +7,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Caching_Strategies_T.i"
+#include "ace/Caching_Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index b380e7d8b6e..cbf1157a96e 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -532,7 +532,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Caching_Strategies_T.i"
+#include "ace/Caching_Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.inl
index 12e82be947b..12e82be947b 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.inl
diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp
index 0b6b4c167a4..422024834ac 100644
--- a/ace/Capabilities.cpp
+++ b/ace/Capabilities.cpp
@@ -4,7 +4,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Capabilities.i"
+#include "ace/Capabilities.inl"
 #endif /* !__ACE_INLINE__ */
 
 #include "ace/OS_NS_stdio.h"
diff --git a/ace/Capabilities.h b/ace/Capabilities.h
index 5e219e3efb8..902dc31a540 100644
--- a/ace/Capabilities.h
+++ b/ace/Capabilities.h
@@ -205,7 +205,7 @@ is_line (const ACE_TCHAR *line)
 #endif /* ACE_IS_SPLITTING */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Capabilities.i"
+#include "ace/Capabilities.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Capabilities.i b/ace/Capabilities.inl
index ca168c0491a..ca168c0491a 100644
--- a/ace/Capabilities.i
+++ b/ace/Capabilities.inl
diff --git a/ace/Containers.cpp b/ace/Containers.cpp
index 2d6815e3c35..63faaef39bd 100644
--- a/ace/Containers.cpp
+++ b/ace/Containers.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (ace,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Containers.i"
+#include "ace/Containers.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Containers.h b/ace/Containers.h
index 69329b09b3e..b5356ecdf3e 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -63,7 +63,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Containers.i"
+#include "ace/Containers.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Containers_T.h"
diff --git a/ace/Containers.i b/ace/Containers.inl
index 1312f2a47a6..1312f2a47a6 100644
--- a/ace/Containers.i
+++ b/ace/Containers.inl
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 6bb6311e021..ac94ef42be1 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -14,7 +14,7 @@
 #include "ace/Containers.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Containers_T.i"
+#include "ace/Containers_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index e4cb1333d4f..9c7fd552d49 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -1979,7 +1979,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Containers_T.i"
+#include "ace/Containers_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Containers_T.i b/ace/Containers_T.inl
index 885345ba9a8..885345ba9a8 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.inl
diff --git a/ace/DEV.cpp b/ace/DEV.cpp
index b40b5113b93..932d7644ad5 100644
--- a/ace/DEV.cpp
+++ b/ace/DEV.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/DEV.i"
+#include "ace/DEV.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, DEV, "$Id$")
diff --git a/ace/DEV.h b/ace/DEV.h
index dce727e02bd..69a92aaad1b 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -67,7 +67,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/DEV.i"
+#include "ace/DEV.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/DEV.i b/ace/DEV.inl
index 91246710423..91246710423 100644
--- a/ace/DEV.i
+++ b/ace/DEV.inl
diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp
index 4166c812c63..00dc5c81bcf 100644
--- a/ace/DEV_Addr.cpp
+++ b/ace/DEV_Addr.cpp
@@ -3,7 +3,7 @@
 
 #include "ace/DEV_Addr.h"
 #if !defined (__ACE_INLINE__)
-#include "ace/DEV_Addr.i"
+#include "ace/DEV_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
@@ -25,14 +25,14 @@ ACE_DEV_Addr::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-// Do nothing constructor. 
+// Do nothing constructor.
 
 ACE_DEV_Addr::ACE_DEV_Addr (void)
   : ACE_Addr (AF_DEV, sizeof this->devname_)
 {
   ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
 
-  (void) ACE_OS::memset ((void *) &this->devname_, 
+  (void) ACE_OS::memset ((void *) &this->devname_,
 			 0, sizeof this->devname_);
 }
 
@@ -46,13 +46,13 @@ ACE_DEV_Addr::set (const ACE_DEV_Addr &sa)
                            0,
                            sizeof this->devname_);
   else
-    (void) ACE_OS::memcpy ((void *) &this->devname_, 
-                           (void *) &sa.devname_, 
+    (void) ACE_OS::memcpy ((void *) &this->devname_,
+                           (void *) &sa.devname_,
                            sa.get_size ());
   return 0;
 }
 
-// Copy constructor. 
+// Copy constructor.
 
 ACE_DEV_Addr::ACE_DEV_Addr (const ACE_DEV_Addr &sa)
   : ACE_Addr (AF_DEV, sizeof this->devname_)
@@ -76,8 +76,8 @@ ACE_DEV_Addr::operator= (const ACE_DEV_Addr &sa)
   ACE_TRACE ("ACE_DEV_Addr::operator=");
 
   if (this != &sa)
-    (void) ACE_OS::memcpy ((void *) &this->devname_, 
-			   (void *) &sa.devname_, 
+    (void) ACE_OS::memcpy ((void *) &this->devname_,
+			   (void *) &sa.devname_,
 			   sa.get_size ());
   return *this;
 }
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index 6d2dac5ebfd..d7825302eaf 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -78,7 +78,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/DEV_Addr.i"
+#include "ace/DEV_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/DEV_Addr.i b/ace/DEV_Addr.inl
index c3fd906d0ad..c3fd906d0ad 100644
--- a/ace/DEV_Addr.i
+++ b/ace/DEV_Addr.inl
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 14b3bf90a86..3bb63a3aae1 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -6,7 +6,7 @@
 #include "ace/Handle_Ops.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/DEV_Connector.i"
+#include "ace/DEV_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, DEV_Connector, "$Id$")
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index 16c0da5da84..858cd5d0369 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -98,7 +98,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/DEV_Connector.i"
+#include "ace/DEV_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.inl
index 798639197b4..798639197b4 100644
--- a/ace/DEV_Connector.i
+++ b/ace/DEV_Connector.inl
diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp
index 47e8bb308fd..fb025287df0 100644
--- a/ace/DEV_IO.cpp
+++ b/ace/DEV_IO.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/DEV_IO.i"
+#include "ace/DEV_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, DEV_IO, "$Id$")
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 2c626dd3b9b..6050db06050 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -171,7 +171,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/DEV_IO.i"
+#include "ace/DEV_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/DEV_IO.i b/ace/DEV_IO.inl
index 309ea6c6cde..309ea6c6cde 100644
--- a/ace/DEV_IO.i
+++ b/ace/DEV_IO.inl
diff --git a/ace/Date_Time.cpp b/ace/Date_Time.cpp
index 89f57c4077f..85abf562c47 100644
--- a/ace/Date_Time.cpp
+++ b/ace/Date_Time.cpp
@@ -4,7 +4,7 @@
 #include "ace/Date_Time.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Date_Time.i"
+#include "ace/Date_Time.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Date_Time, "$Id$")
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index 049569228d6..d11af119f9d 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -114,7 +114,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Date_Time.i"
+#include "ace/Date_Time.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Date_Time.i b/ace/Date_Time.inl
index 4dbc8ecc657..4dbc8ecc657 100644
--- a/ace/Date_Time.i
+++ b/ace/Date_Time.inl
diff --git a/ace/Dirent.cpp b/ace/Dirent.cpp
index d8a283a7368..a819b0b33a1 100644
--- a/ace/Dirent.cpp
+++ b/ace/Dirent.cpp
@@ -3,7 +3,7 @@
 #include "ace/Dirent.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dirent.i"
+#include "ace/Dirent.inl"
 #else
 #if defined (__hpux) && !defined (__GNUG__)
 static int shut_up_aCC = 0;
diff --git a/ace/Dirent.h b/ace/Dirent.h
index 7749042a74e..5cda1c442fb 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -111,7 +111,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dirent.i"
+#include "ace/Dirent.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Dirent.i b/ace/Dirent.inl
index c75c79fd320..c75c79fd320 100644
--- a/ace/Dirent.i
+++ b/ace/Dirent.inl
diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp
index ebca028eba3..fbab1172542 100644
--- a/ace/Dynamic.cpp
+++ b/ace/Dynamic.cpp
@@ -8,7 +8,7 @@
 #include "ace/Null_Mutex.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dynamic.i"
+#include "ace/Dynamic.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Dynamic, "$Id$")
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index 87ddc53f258..d6c3ab9466b 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -64,7 +64,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dynamic.i"
+#include "ace/Dynamic.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Dynamic.i b/ace/Dynamic.inl
index 9d1595441d6..9d1595441d6 100644
--- a/ace/Dynamic.i
+++ b/ace/Dynamic.inl
diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp
index 7c1417345f0..404916d4528 100644
--- a/ace/Dynamic_Service.cpp
+++ b/ace/Dynamic_Service.cpp
@@ -13,7 +13,7 @@
 #include "ace/Service_Object.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Dynamic_Service.i"
+#include "ace/Dynamic_Service.inl"
 #endif /* __ACE_INLINE__ */
 
 template <class TYPE> TYPE *
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index df4a1843e63..85d1a2f7730 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -48,7 +48,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Dynamic_Service.i"
+#include "ace/Dynamic_Service.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Dynamic_Service.i b/ace/Dynamic_Service.inl
index f2ebfc81e1b..f2ebfc81e1b 100644
--- a/ace/Dynamic_Service.i
+++ b/ace/Dynamic_Service.inl
diff --git a/ace/Env_Value_T.cpp b/ace/Env_Value_T.cpp
index d99819ec6b9..dcab4e0522c 100644
--- a/ace/Env_Value_T.cpp
+++ b/ace/Env_Value_T.cpp
@@ -6,7 +6,7 @@
 #include "ace/Env_Value_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ace/Env_Value_T.i"
+#include "ace/Env_Value_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Env_Value_T, "$Id$")
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 0e1d90ca789..1be09942bb8 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -78,7 +78,7 @@ template <class T> void ACE_Convert (const ACE_TCHAR *s, T &t);
 // Function to convert a string <s> into type <T>.
 
 #if defined (__ACE_INLINE__)
-#include "ace/Env_Value_T.i"
+#include "ace/Env_Value_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Env_Value_T.i b/ace/Env_Value_T.inl
index 9f98f0fdb45..9f98f0fdb45 100644
--- a/ace/Env_Value_T.i
+++ b/ace/Env_Value_T.inl
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 68096069673..5db15c15e41 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -8,7 +8,7 @@
 #include "ace/Thread_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Event_Handler.i"
+#include "ace/Event_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Event_Handler, "$Id$")
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 669d923d5e2..c0aea234a72 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -377,7 +377,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Event_Handler.i"
+#include "ace/Event_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Event_Handler.i b/ace/Event_Handler.inl
index d07de45a072..d07de45a072 100644
--- a/ace/Event_Handler.i
+++ b/ace/Event_Handler.inl
diff --git a/ace/Event_Handler_T.cpp b/ace/Event_Handler_T.cpp
index be894914570..d2b19d1dfae 100644
--- a/ace/Event_Handler_T.cpp
+++ b/ace/Event_Handler_T.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(ace, Event_Handler_T, "$Id$")
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Event_Handler_T.i"
+#include "ace/Event_Handler_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T)
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index df5350085db..4f2d10f3df8 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -171,7 +171,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Event_Handler_T.i"
+#include "ace/Event_Handler_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.inl
index d096ebeed78..d096ebeed78 100644
--- a/ace/Event_Handler_T.i
+++ b/ace/Event_Handler_T.inl
diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp
index 6c428a4dbe9..89c6019e449 100644
--- a/ace/FIFO.cpp
+++ b/ace/FIFO.cpp
@@ -4,7 +4,7 @@
 #include "ace/FIFO.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FIFO.i"
+#include "ace/FIFO.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/FIFO.h b/ace/FIFO.h
index 86b643ea064..1b88db74a1d 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -74,7 +74,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FIFO.i"
+#include "ace/FIFO.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FIFO.i b/ace/FIFO.inl
index 0c91ceaca3f..0c91ceaca3f 100644
--- a/ace/FIFO.i
+++ b/ace/FIFO.inl
diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp
index e517fb4b5b2..4aa92e29acd 100644
--- a/ace/FIFO_Recv.cpp
+++ b/ace/FIFO_Recv.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FIFO_Recv.i"
+#include "ace/FIFO_Recv.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FIFO_Recv, "$Id$")
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index d9cd3e979d9..ea1b391edb9 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -73,7 +73,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FIFO_Recv.i"
+#include "ace/FIFO_Recv.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.inl
index 5817a486624..5817a486624 100644
--- a/ace/FIFO_Recv.i
+++ b/ace/FIFO_Recv.inl
diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp
index b9094fe00f2..de6055f5707 100644
--- a/ace/FIFO_Recv_Msg.cpp
+++ b/ace/FIFO_Recv_Msg.cpp
@@ -6,7 +6,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FIFO_Recv_Msg.i"
+#include "ace/FIFO_Recv_Msg.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$")
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 7b0760022d9..cc35bc22423 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -127,7 +127,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FIFO_Recv_Msg.i"
+#include "ace/FIFO_Recv_Msg.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FIFO_Recv_Msg.i b/ace/FIFO_Recv_Msg.inl
index c5a81e02a62..c5a81e02a62 100644
--- a/ace/FIFO_Recv_Msg.i
+++ b/ace/FIFO_Recv_Msg.inl
diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp
index 35d242e4a1f..9e347ef67ee 100644
--- a/ace/FIFO_Send.cpp
+++ b/ace/FIFO_Send.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FIFO_Send.i"
+#include "ace/FIFO_Send.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FIFO_Send, "$Id$")
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 5146635fbe6..125f1a42e15 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -63,7 +63,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FIFO_Send.i"
+#include "ace/FIFO_Send.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.inl
index eb503d9b831..eb503d9b831 100644
--- a/ace/FIFO_Send.i
+++ b/ace/FIFO_Send.inl
diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp
index f3048ec3cf0..1575f7ae98c 100644
--- a/ace/FIFO_Send_Msg.cpp
+++ b/ace/FIFO_Send_Msg.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_sys_uio.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FIFO_Send_Msg.i"
+#include "ace/FIFO_Send_Msg.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FIFO_Send_Msg, "$Id$")
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index f614a60065e..b4efb1607cf 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -76,7 +76,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FIFO_Send_Msg.i"
+#include "ace/FIFO_Send_Msg.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FIFO_Send_Msg.i b/ace/FIFO_Send_Msg.inl
index 34bb88aabc3..34bb88aabc3 100644
--- a/ace/FIFO_Send_Msg.i
+++ b/ace/FIFO_Send_Msg.inl
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index b652c3da0ae..5e1281a8722 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -10,7 +10,7 @@
 #include "ace/OS_NS_sys_stat.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FILE.i"
+#include "ace/FILE.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FILE, "$Id$")
diff --git a/ace/FILE.h b/ace/FILE.h
index 814c2e4f0f6..a5db4c11285 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -136,7 +136,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FILE.i"
+#include "ace/FILE.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FILE.i b/ace/FILE.inl
index 934f5d7aa98..934f5d7aa98 100644
--- a/ace/FILE.i
+++ b/ace/FILE.inl
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 14e5a1e4478..5109e375253 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -8,7 +8,7 @@
 #include "ace/os_include/sys/os_socket.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FILE_Addr.i"
+#include "ace/FILE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FILE_Addr, "$Id$")
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index 6f34d883edd..c1955e7994a 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -79,7 +79,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FILE_Addr.i"
+#include "ace/FILE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FILE_Addr.i b/ace/FILE_Addr.inl
index 8db6f046434..8db6f046434 100644
--- a/ace/FILE_Addr.i
+++ b/ace/FILE_Addr.inl
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index bbdf638aba2..665deb3c077 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_stdlib.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FILE_Connector.i"
+#include "ace/FILE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FILE_Connector, "$Id$")
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 0a10d4f02ec..f59f13f4413 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -104,7 +104,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FILE_Connector.i"
+#include "ace/FILE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.inl
index 5a3e909072d..5a3e909072d 100644
--- a/ace/FILE_Connector.i
+++ b/ace/FILE_Connector.inl
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index d5fe949fd28..9ac17bb322f 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_Memory.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/FILE_IO.i"
+#include "ace/FILE_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, FILE_IO, "$Id$")
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 03796837338..ee44973a083 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -155,7 +155,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/FILE_IO.i"
+#include "ace/FILE_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/FILE_IO.i b/ace/FILE_IO.inl
index 01db8d9ad1a..01db8d9ad1a 100644
--- a/ace/FILE_IO.i
+++ b/ace/FILE_IO.inl
diff --git a/ace/Flag_Manip.cpp b/ace/Flag_Manip.cpp
index e4b2b87db26..fcd7fa450a5 100644
--- a/ace/Flag_Manip.cpp
+++ b/ace/Flag_Manip.cpp
@@ -8,7 +8,7 @@
 #endif /* ACE_WIN32 || VXWORKS || ACE_LACKS_FCNTL */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Flag_Manip.i"
+#include "ace/Flag_Manip.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (CYGWIN32)
diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h
index a28dcc41088..2c3622ee623 100644
--- a/ace/Flag_Manip.h
+++ b/ace/Flag_Manip.h
@@ -43,7 +43,7 @@ class ACE_Export ACE_Flag_Manip
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Flag_Manip.i"
+#include "ace/Flag_Manip.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.inl
index 3eb4b236023..3eb4b236023 100644
--- a/ace/Flag_Manip.i
+++ b/ace/Flag_Manip.inl
diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index 703e2f7f572..0405fe1e9fb 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Free_List.i"
+#include "ace/Free_List.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Free_List, "$Id$")
diff --git a/ace/Free_List.h b/ace/Free_List.h
index 708e5e56782..4f4b3a3366a 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -135,7 +135,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Free_List.i"
+#include "ace/Free_List.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Free_List.i b/ace/Free_List.inl
index c5668dfd0bc..c5668dfd0bc 100644
--- a/ace/Free_List.i
+++ b/ace/Free_List.inl
diff --git a/ace/Functor.cpp b/ace/Functor.cpp
index d83ef473c6f..ca519868ef5 100644
--- a/ace/Functor.cpp
+++ b/ace/Functor.cpp
@@ -36,7 +36,7 @@
 #include "ace/Functor.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Functor.i"
+#include "ace/Functor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Functor, "$Id$")
diff --git a/ace/Functor.h b/ace/Functor.h
index 16d3fa4a12a..5731598f7e7 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -474,7 +474,7 @@ public:
 #endif  // ACE_HAS_WCHAR
 
 #if defined (__ACE_INLINE__)
-#include "ace/Functor.i"
+#include "ace/Functor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Functor.i b/ace/Functor.inl
index 7ed2fc596c6..7ed2fc596c6 100644
--- a/ace/Functor.i
+++ b/ace/Functor.inl
diff --git a/ace/Functor_T.cpp b/ace/Functor_T.cpp
index 73b183d0fd3..c29f9029f75 100644
--- a/ace/Functor_T.cpp
+++ b/ace/Functor_T.cpp
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Functor_T.i"
+#include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Functor_T, "$Id$")
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index 21bb01be168..e960cad0d26 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -137,7 +137,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Functor_T.i"
+#include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/Functor_T.i b/ace/Functor_T.inl
index 51caa11825d..51caa11825d 100644
--- a/ace/Functor_T.i
+++ b/ace/Functor_T.inl
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index ac4a1a70376..a446a3f3d07 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -3,7 +3,7 @@
 #include "ace/Get_Opt.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Get_Opt.i"
+#include "ace/Get_Opt.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ACE.h"
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index d47ec809b27..5a29f57b575 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -459,7 +459,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Get_Opt.i"
+#include "ace/Get_Opt.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Get_Opt.i b/ace/Get_Opt.inl
index f6583402b76..f6583402b76 100644
--- a/ace/Get_Opt.i
+++ b/ace/Get_Opt.inl
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
index e506e0c1f75..8b3e472e7b8 100644
--- a/ace/Handle_Gobbler.h
+++ b/ace/Handle_Gobbler.h
@@ -58,7 +58,7 @@ private:
   HANDLE_SET handle_set_;
 };
 
-#include "ace/Handle_Gobbler.i"
+#include "ace/Handle_Gobbler.inl"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HANDLE_GOBBLER_H */
diff --git a/ace/Handle_Gobbler.i b/ace/Handle_Gobbler.inl
index 12887593086..12887593086 100644
--- a/ace/Handle_Gobbler.i
+++ b/ace/Handle_Gobbler.inl
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 7199533f1a5..682867014ee 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -4,7 +4,7 @@
 #include "ace/Handle_Set.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Handle_Set.i"
+#include "ace/Handle_Set.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_string.h"
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index d7024ab30cf..d732dfe4ef5 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -237,7 +237,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Handle_Set.i"
+#include "ace/Handle_Set.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.inl
index d00fb384863..d00fb384863 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.inl
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index 570aef4012c..dbf0be45b76 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Hash_Cache_Map_Manager_T.i"
+#include "ace/Hash_Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Hash_Cache_Map_Manager_T, "$Id$")
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index 85ace1cce1c..9348288bfce 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -193,7 +193,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Hash_Cache_Map_Manager_T.i"
+#include "ace/Hash_Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Hash_Cache_Map_Manager_T.i b/ace/Hash_Cache_Map_Manager_T.inl
index 84d40bffbb6..84d40bffbb6 100644
--- a/ace/Hash_Cache_Map_Manager_T.i
+++ b/ace/Hash_Cache_Map_Manager_T.inl
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index 846223a77ac..4d442a61234 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Hash_Map_Manager_T.i"
+# include "ace/Hash_Map_Manager_T.inl"
 #elif defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420)
 // If ACE_INLINE is on and we are on SunCC, undefine ACE_INLINE,
 // include ace/Hash_Map_Manager_T.i, and then redefine ACE_INLINE.
@@ -31,7 +31,7 @@
 // the code in ace/Hash_Map_Manager_T.i (with the fast option).
 # undef ACE_INLINE
 # define ACE_INLINE
-# include "ace/Hash_Map_Manager_T.i"
+# include "ace/Hash_Map_Manager_T.inl"
 # undef ACE_INLINE
 # define ACE_INLINE inline
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index 33970700224..f71b71fd3b1 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -938,7 +938,7 @@ public:
 // This nonsense is necessary since SunCC (version 4.2) cannot inline
 // the code in ace/Hash_Map_Manager_T.i (with the fast option).
 # if !(defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420))
-#  include "ace/Hash_Map_Manager_T.i"
+#  include "ace/Hash_Map_Manager_T.inl"
 # endif /* ! __SUNPRO_CC */
 #endif /* __ACE_INLINE__ */
 
diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.inl
index d1b05afa492..d1b05afa492 100644
--- a/ace/Hash_Map_Manager_T.i
+++ b/ace/Hash_Map_Manager_T.inl
diff --git a/ace/Hash_Map_With_Allocator_T.cpp b/ace/Hash_Map_With_Allocator_T.cpp
index 644dfe50e06..20587b9d7ba 100644
--- a/ace/Hash_Map_With_Allocator_T.cpp
+++ b/ace/Hash_Map_With_Allocator_T.cpp
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
+#include "ace/Hash_Map_With_Allocator_T.inl"
 #endif /* __ACE_INLINE__ */
 
 template <class EXT_ID, class INT_ID>
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
index 7d97a26bcfe..6ae11547c0c 100644
--- a/ace/Hash_Map_With_Allocator_T.h
+++ b/ace/Hash_Map_With_Allocator_T.h
@@ -87,7 +87,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
+#include "ace/Hash_Map_With_Allocator_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Hash_Map_With_Allocator_T.i b/ace/Hash_Map_With_Allocator_T.inl
index 5b8c42dde3d..5b8c42dde3d 100644
--- a/ace/Hash_Map_With_Allocator_T.i
+++ b/ace/Hash_Map_With_Allocator_T.inl
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index d549a2ee64c..57ece6e2f05 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -10,7 +10,7 @@
 #include "ace/High_Res_Timer.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/High_Res_Timer.i"
+#include "ace/High_Res_Timer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Stats.h"
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 94b883dab7d..ec5c085aac8 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -305,7 +305,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/High_Res_Timer.i"
+#include "ace/High_Res_Timer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/High_Res_Timer.i b/ace/High_Res_Timer.inl
index 8b9e72b828e..8b9e72b828e 100644
--- a/ace/High_Res_Timer.i
+++ b/ace/High_Res_Timer.inl
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index caaed4bc155..3672846aa9b 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -5,7 +5,7 @@
 #include "ace/INET_Addr.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/INET_Addr.i"
+#include "ace/INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 2ca83764ae1..13df88af9de 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -344,7 +344,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/INET_Addr.i"
+#include "ace/INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/INET_Addr.i b/ace/INET_Addr.inl
index 2f1b4f6c968..2f1b4f6c968 100644
--- a/ace/INET_Addr.i
+++ b/ace/INET_Addr.inl
diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp
index da7f9de66ec..e9b5dee35bf 100644
--- a/ace/IOStream_T.cpp
+++ b/ace/IOStream_T.cpp
@@ -28,7 +28,7 @@ ACE_RCSID(ace, IOStream_T, "$Id$")
 #endif /*__GNUG__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/IOStream_T.i"
+#include "ace/IOStream_T.inl"
 #endif /* !__ACE_INLINE__ */
 
 // We will be given a STREAM by the iostream object which creates us.
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index a1caf38c2a9..9569ba15888 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -11,7 +11,7 @@
  *
  * This file should not be #included directly by application
  * code. Instead, it should #include "ace/IOStream.h".  That's because
- * we only put some conditional compilations in that file. 
+ * we only put some conditional compilations in that file.
  */
 //=============================================================================
 
@@ -274,7 +274,7 @@ protected:
 };
 
 #  if defined (__ACE_INLINE__)
-#    include "ace/IOStream_T.i"
+#    include "ace/IOStream_T.inl"
 #  endif /* __ACE_INLINE__ */
 
 #  if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/IOStream_T.i b/ace/IOStream_T.inl
index da8a071ee29..da8a071ee29 100644
--- a/ace/IOStream_T.i
+++ b/ace/IOStream_T.inl
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index b6b661810ce..1a92cb8ad66 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -10,7 +10,7 @@
 #include "ace/os_include/os_signal.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/IO_SAP.i"
+#include "ace/IO_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, IO_SAP, "$Id$")
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 099e5d8f988..50d530de4ae 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -84,7 +84,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/IO_SAP.i"
+#include "ace/IO_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/IO_SAP.i b/ace/IO_SAP.inl
index d120cd91b17..d120cd91b17 100644
--- a/ace/IO_SAP.i
+++ b/ace/IO_SAP.inl
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index 4e4682c00cb..7bf4b6f0110 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/IPC_SAP.i"
+#include "ace/IPC_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, IPC_SAP, "$Id$")
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index f7ff3f0f57b..72828c8f74c 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -78,7 +78,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/IPC_SAP.i"
+#include "ace/IPC_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/IPC_SAP.i b/ace/IPC_SAP.inl
index 69a5befa3b1..69a5befa3b1 100644
--- a/ace/IPC_SAP.i
+++ b/ace/IPC_SAP.inl
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index 67b1236efc1..a3c14fc7fcd 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(ace, LSOCK, "$Id$")
 #include "ace/OS_NS_sys_socket.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/LSOCK.i"
+#include "ace/LSOCK.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK)
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 662e8604d02..65cfda6eee7 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -71,7 +71,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/LSOCK.i"
+#include "ace/LSOCK.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK.i b/ace/LSOCK.inl
index fcd0e6887fc..fcd0e6887fc 100644
--- a/ace/LSOCK.i
+++ b/ace/LSOCK.inl
diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp
index 080970a6f08..4e58022b36c 100644
--- a/ace/LSOCK_CODgram.cpp
+++ b/ace/LSOCK_CODgram.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID(ace, LSOCK_CODgram, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/LSOCK_CODgram.i"
+#include "ace/LSOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram)
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index 1025c6fadbd..637cc227917 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -66,7 +66,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/LSOCK_CODgram.i"
+#include "ace/LSOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_CODgram.i b/ace/LSOCK_CODgram.inl
index 48c7280459f..48c7280459f 100644
--- a/ace/LSOCK_CODgram.i
+++ b/ace/LSOCK_CODgram.inl
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index 43aa65246c4..4b29ff1e0cf 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(ace, LSOCK_Connector, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/LSOCK_Connector.i"
+#include "ace/LSOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index bff88675e18..f0e1b4460fd 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -79,7 +79,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/LSOCK_Connector.i"
+#include "ace/LSOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Connector.i b/ace/LSOCK_Connector.inl
index 3638a687297..3638a687297 100644
--- a/ace/LSOCK_Connector.i
+++ b/ace/LSOCK_Connector.inl
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp
index f31f5e56d73..9b4cebddc89 100644
--- a/ace/LSOCK_Dgram.cpp
+++ b/ace/LSOCK_Dgram.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(ace, LSOCK_Dgram, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/LSOCK_Dgram.i"
+#include "ace/LSOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram)
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index ad7ed1afddc..ad762ede13d 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -63,7 +63,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/LSOCK_Dgram.i"
+#include "ace/LSOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Dgram.i b/ace/LSOCK_Dgram.inl
index 14c415ceaa8..14c415ceaa8 100644
--- a/ace/LSOCK_Dgram.i
+++ b/ace/LSOCK_Dgram.inl
diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp
index 3af27239ec4..5b0cd23382f 100644
--- a/ace/LSOCK_Stream.cpp
+++ b/ace/LSOCK_Stream.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(ace, LSOCK_Stream, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/LSOCK_Stream.i"
+#include "ace/LSOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Stream)
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index c1089322583..a2b2663f269 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -70,7 +70,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/LSOCK_Stream.i"
+#include "ace/LSOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Stream.i b/ace/LSOCK_Stream.inl
index 7b94768e3c7..7b94768e3c7 100644
--- a/ace/LSOCK_Stream.i
+++ b/ace/LSOCK_Stream.inl
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index a2d49dfad70..0281408a602 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Local_Tokens.i"
+#include "ace/Local_Tokens.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 75473a5dafb..6e68856d02e 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -1112,7 +1112,7 @@ protected:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Local_Tokens.i"
+#include "ace/Local_Tokens.inl"
 #endif /* __ACE_INLINE__ */
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCAL_MUTEX_H */
diff --git a/ace/Local_Tokens.i b/ace/Local_Tokens.inl
index 5fed1b6c025..5fed1b6c025 100644
--- a/ace/Local_Tokens.i
+++ b/ace/Local_Tokens.inl
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index e1ba6af5a1d..d5ca1493b4a 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_time.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Log_Record.i"
+# include "ace/Log_Record.inl"
 #endif /* __ACE_INLINE__ */
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 3a4af02cf6b..896fb3dedce 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -194,7 +194,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Log_Record.i"
+#include "ace/Log_Record.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Log_Record.i b/ace/Log_Record.inl
index b670116ce00..b670116ce00 100644
--- a/ace/Log_Record.i
+++ b/ace/Log_Record.inl
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index dc5fc35d68c..4ab26d7e651 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -10,7 +10,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_Acceptor.i"
+#include "ace/MEM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, MEM_Acceptor, "$Id$")
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index cef32124920..d9771a1bf37 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -177,7 +177,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_Acceptor.i"
+#include "ace/MEM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Acceptor.i b/ace/MEM_Acceptor.inl
index d7e3f66f18f..d7e3f66f18f 100644
--- a/ace/MEM_Acceptor.i
+++ b/ace/MEM_Acceptor.inl
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index 971f8f7bc7f..48a914c83b0 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -7,7 +7,7 @@
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_Addr.i"
+#include "ace/MEM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index d0cc27261b5..d3add754b4a 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -144,7 +144,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_Addr.i"
+#include "ace/MEM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Addr.i b/ace/MEM_Addr.inl
index 9ebf3cced94..9ebf3cced94 100644
--- a/ace/MEM_Addr.i
+++ b/ace/MEM_Addr.inl
diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp
index 76055af6fcf..59136b02154 100644
--- a/ace/MEM_Connector.cpp
+++ b/ace/MEM_Connector.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(ace, MEM_Connector, "$Id$")
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_Connector.i"
+#include "ace/MEM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector)
diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h
index 78829dde268..434c94f2429 100644
--- a/ace/MEM_Connector.h
+++ b/ace/MEM_Connector.h
@@ -165,7 +165,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_Connector.i"
+#include "ace/MEM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Connector.i b/ace/MEM_Connector.inl
index 15bf7c9ee75..15bf7c9ee75 100644
--- a/ace/MEM_Connector.i
+++ b/ace/MEM_Connector.inl
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index abe94666726..00e72ab5637 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -7,7 +7,7 @@
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_IO.i"
+#include "ace/MEM_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, MEM_IO, "$Id$")
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index f22c94f10de..213587e4346 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -295,7 +295,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_IO.i"
+#include "ace/MEM_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_IO.i b/ace/MEM_IO.inl
index f1b92817e1c..f1b92817e1c 100644
--- a/ace/MEM_IO.i
+++ b/ace/MEM_IO.inl
diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp
index ebc4c8c3bc5..edb45a4b1ed 100644
--- a/ace/MEM_SAP.cpp
+++ b/ace/MEM_SAP.cpp
@@ -5,7 +5,7 @@
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_SAP.i"
+#include "ace/MEM_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, MEM_SAP, "$Id$")
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index c726e16fb3f..e92a156991b 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -152,7 +152,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_SAP.i"
+#include "ace/MEM_SAP.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_SAP.i b/ace/MEM_SAP.inl
index 4b9483725b2..4b9483725b2 100644
--- a/ace/MEM_SAP.i
+++ b/ace/MEM_SAP.inl
diff --git a/ace/MEM_Stream.cpp b/ace/MEM_Stream.cpp
index 5758b2bd12a..dc32670142a 100644
--- a/ace/MEM_Stream.cpp
+++ b/ace/MEM_Stream.cpp
@@ -6,7 +6,7 @@
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/MEM_Stream.i"
+#include "ace/MEM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, MEM_Stream, "$Id$")
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index d61b4c8992e..ed39a966314 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -140,7 +140,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/MEM_Stream.i"
+#include "ace/MEM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Stream.i b/ace/MEM_Stream.inl
index b92d4c7471f..b92d4c7471f 100644
--- a/ace/MEM_Stream.i
+++ b/ace/MEM_Stream.inl
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 17d9bc14712..b9abe1987d0 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -1058,184 +1058,184 @@ HEADER_FILES = \
 ## Make sure config.h and config-all.h are in the above header list!
 
 INLINE_FILES = \
-  ACE.i \
-  Activation_Queue.i \
-  Active_Map_Manager.i \
-  Active_Map_Manager_T.i \
-  Addr.i \
-  ARGV.i \
-  Asynch_IO_Impl.i \
-  ATM_Acceptor.i \
-  ATM_Addr.i \
-  ATM_Connector.i \
-  ATM_Params.i \
-  ATM_QoS.i \
-  ATM_Stream.i \
-  Atomic_Op.i \
-  Atomic_Op_T.i \
-  Auto_IncDec_T.i \
-  Auto_Ptr.i \
-  Based_Pointer_T.i \
-  Basic_Types.i \
-  Bound_Ptr.i \
-  Cache_Map_Manager_T.i \
-  Caching_Strategies_T.i \
-  Capabilities.i \
-  CDR_Stream.i \
-  Containers.i \
-  Containers_T.i \
-  Date_Time.i \
-  DEV_Addr.i \
-  DEV_Connector.i \
-  DEV.i \
-  DEV_IO.i \
-  Dirent.i \
-  Dynamic.i \
-  Dynamic_Service.i \
-  Env_Value_T.i \
-  Event_Handler.i \
-  Event_Handler_T.i \
-  FIFO.i \
-  FIFO_Recv.i \
-  FIFO_Recv_Msg.i \
-  FIFO_Send.i \
-  FIFO_Send_Msg.i \
-  FILE_Addr.i \
-  FILE_Connector.i \
-  FILE.i \
-  FILE_IO.i \
-  Flag_Manip.i \
-  Free_List.i \
-  Functor.i \
-  Functor_String.inl \
-  Functor_T.i \
-  Get_Opt.i \
-  Handle_Gobbler.i \
-  Handle_Set.i \
-  Hash_Cache_Map_Manager_T.i \
-  Hash_Map_Manager_T.i \
-  Hash_Map_With_Allocator_T.i \
-  High_Res_Timer.i \
-  INET_Addr.i \
-  IO_SAP.i \
-  IOStream_T.i \
-  IPC_SAP.i \
-  Local_Tokens.i \
-  Log_Record.i \
-  LSOCK_CODgram.i \
-  LSOCK_Connector.i \
-  LSOCK_Dgram.i \
-  LSOCK.i \
-  LSOCK_Stream.i \
-  Malloc_Allocator.i \
-  Malloc.i \
-  Malloc_T.i \
-  Managed_Object.i \
-  Map_Manager.i \
-  Map_T.i \
-  MEM_Acceptor.i \
-  MEM_Addr.i \
-  MEM_Connector.i \
-  MEM_IO.i \
-  Mem_Map.i \
-  Memory_Pool.i \
-  MEM_SAP.i \
-  MEM_Stream.i \
-  Message_Block.i \
-  Message_Block_T.i \
-  Message_Queue.i \
-  Message_Queue_T.i \
-  Metrics_Cache_T.i \
-  Module.i \
-  Msg_WFMO_Reactor.i \
-  Multihomed_INET_Addr.i \
-  Multiplexor.i \
-  NT_Service.i \
-  Obchunk.i \
-  Object_Manager.i \
-  Obstack_T.i \
-  OS.i \
-  Pair_T.i \
-  Parse_Node.i \
-  PI_Malloc.i \
-  Pipe.i \
-  POSIX_CB_Proactor.i \
-  POSIX_Proactor.i \
-  Proactor.i \
-  Process.i \
-  Process_Manager.i \
-  Profile_Timer.i \
-  RB_Tree.i \
-  Reactor.i \
-  Read_Buffer.i \
-  Refcounted_Auto_Ptr.i \
-  Remote_Tokens.i \
-  Sched_Params.i \
-  Select_Reactor_Base.i \
-  Select_Reactor_T.i \
-  Service_Config.i \
-  Service_Manager.i \
-  Service_Object.i \
-  Service_Repository.i \
-  Service_Types.i \
-  Shared_Memory_MM.i \
-  Shared_Memory_SV.i \
-  Shared_Object.i \
-  Signal.i \
-  Singleton.i \
-  SOCK_Acceptor.i \
-  SOCK_CODgram.i \
-  SOCK_Connector.i \
-  SOCK_Dgram_Bcast.i \
-  SOCK_Dgram.i \
-  SOCK_Dgram_Mcast.i \
-  SOCK.i \
-  SOCK_IO.i \
-  SOCK_SEQPACK_Acceptor.i \
-  SOCK_SEQPACK_Association.i \
-  SOCK_SEQPACK_Connector.i \
-  SOCK_Stream.i \
-  SPIPE_Addr.i \
-  SPIPE_Connector.i \
-  SPIPE.i \
-  SPIPE_Stream.i \
-  SString.i \
-  Stats.i \
-  Strategies_T.i \
-  Stream.i \
-  String_Base.i \
-  SUN_Proactor.i \
-  SV_Message.i \
-  SV_Message_Queue.i \
-  SV_Semaphore_Complex.i \
-  SV_Semaphore_Simple.i \
-  SV_Shared_Memory.i \
-  Synch_Options.i \
-  Task_Ex_T.i \
-  Task.i \
-  Task_T.i \
-  Thread.i \
-  Thread_Manager.i \
-  Timeprobe.i \
-  Timer_Queue_Adapters.i \
-  Timer_Queue_T.i \
-  TLI_Connector.i \
-  TLI.i \
-  TLI_Stream.i \
-  Token_Collection.i \
-  Token.i \
-  Token_Manager.i \
-  Token_Request_Reply.i \
-  TP_Reactor.i \
-  Typed_SV_Message.i \
-  Typed_SV_Message_Queue.i \
-  UNIX_Addr.i \
-  UPIPE_Acceptor.i \
-  UPIPE_Connector.i \
-  UPIPE_Stream.i \
-  Vector_T.i \
-  WFMO_Reactor.i \
-  XTI_ATM_Mcast.i \
+  ACE.inl \
+  Activation_Queue.inl \
+  Active_Map_Manager.inl \
+  Active_Map_Manager_T.inl \
+  Addr.inl \
+  ARGV.inl \
+  Asynch_IO_Impl.inl \
+  ATM_Acceptor.inl \
+  ATM_Addr.inl \
+  ATM_Connector.inl \
+  ATM_Params.inl \
+  ATM_QoS.inl \
+  ATM_Stream.inl \
+  Atomic_Op.inl \
+  Atomic_Op_T.inl \
+  Auto_IncDec_T.inl \
+  Auto_Ptr.inl \
+  Based_Pointer_T.inl \
+  Basic_Types.inl \
+  Bound_Ptr.inl \
+  Cache_Map_Manager_T.inl \
+  Caching_Strategies_T.inl \
+  Capabilities.inl \
+  CDR_Stream.inl \
+  Containers.inl \
+  Containers_T.inl \
+  Date_Time.inl \
+  DEV_Addr.inl \
+  DEV_Connector.inl \
+  DEV.inl \
+  DEV_IO.inl \
+  Dirent.inl \
+  Dynamic.inl \
+  Dynamic_Service.inl \
+  Env_Value_T.inl \
+  Event_Handler.inl \
+  Event_Handler_T.inl \
+  FIFO.inl \
+  FIFO_Recv.inl \
+  FIFO_Recv_Msg.inl \
+  FIFO_Send.inl \
+  FIFO_Send_Msg.inl \
+  FILE_Addr.inl \
+  FILE_Connector.inl \
+  FILE.inl \
+  FILE_IO.inl \
+  Flag_Manip.inl \
+  Free_List.inl \
+  Functor.inl \
+  Functor_String.inlnl \
+  Functor_T.inl \
+  Get_Opt.inl \
+  Handle_Gobbler.inl \
+  Handle_Set.inl \
+  Hash_Cache_Map_Manager_T.inl \
+  Hash_Map_Manager_T.inl \
+  Hash_Map_With_Allocator_T.inl \
+  High_Res_Timer.inl \
+  INET_Addr.inl \
+  IO_SAP.inl \
+  IOStream_T.inl \
+  IPC_SAP.inl \
+  Local_Tokens.inl \
+  Log_Record.inl \
+  LSOCK_CODgram.inl \
+  LSOCK_Connector.inl \
+  LSOCK_Dgram.inl \
+  LSOCK.inl \
+  LSOCK_Stream.inl \
+  Malloc_Allocator.inl \
+  Malloc.inl \
+  Malloc_T.inl \
+  Managed_Object.inl \
+  Map_Manager.inl \
+  Map_T.inl \
+  MEM_Acceptor.inl \
+  MEM_Addr.inl \
+  MEM_Connector.inl \
+  MEM_IO.inl \
+  Mem_Map.inl \
+  Memory_Pool.inl \
+  MEM_SAP.inl \
+  MEM_Stream.inl \
+  Message_Block.inl \
+  Message_Block_T.inl \
+  Message_Queue.inl \
+  Message_Queue_T.inl \
+  Metrics_Cache_T.inl \
+  Module.inl \
+  Msg_WFMO_Reactor.inl \
+  Multihomed_INET_Addr.inl \
+  Multiplexor.inl \
+  NT_Service.inl \
+  Obchunk.inl \
+  Object_Manager.inl \
+  Obstack_T.inl \
+  OS.inl \
+  Pair_T.inl \
+  Parse_Node.inl \
+  PI_Malloc.inl \
+  Pipe.inl \
+  POSIX_CB_Proactor.inl \
+  POSIX_Proactor.inl \
+  Proactor.inl \
+  Process.inl \
+  Process_Manager.inl \
+  Profile_Timer.inl \
+  RB_Tree.inl \
+  Reactor.inl \
+  Read_Buffer.inl \
+  Refcounted_Auto_Ptr.inl \
+  Remote_Tokens.inl \
+  Sched_Params.inl \
+  Select_Reactor_Base.inl \
+  Select_Reactor_T.inl \
+  Service_Config.inl \
+  Service_Manager.inl \
+  Service_Object.inl \
+  Service_Repository.inl \
+  Service_Types.inl \
+  Shared_Memory_MM.inl \
+  Shared_Memory_SV.inl \
+  Shared_Object.inl \
+  Signal.inl \
+  Singleton.inl \
+  SOCK_Acceptor.inl \
+  SOCK_CODgram.inl \
+  SOCK_Connector.inl \
+  SOCK_Dgram_Bcast.inl \
+  SOCK_Dgram.inl \
+  SOCK_Dgram_Mcast.inl \
+  SOCK.inl \
+  SOCK_IO.inl \
+  SOCK_SEQPACK_Acceptor.inl \
+  SOCK_SEQPACK_Association.inl \
+  SOCK_SEQPACK_Connector.inl \
+  SOCK_Stream.inl \
+  SPIPE_Addr.inl \
+  SPIPE_Connector.inl \
+  SPIPE.inl \
+  SPIPE_Stream.inl \
+  SString.inl \
+  Stats.inl \
+  Strategies_T.inl \
+  Stream.inl \
+  String_Base.inl \
+  SUN_Proactor.inl \
+  SV_Message.inl \
+  SV_Message_Queue.inl \
+  SV_Semaphore_Complex.inl \
+  SV_Semaphore_Simple.inl \
+  SV_Shared_Memory.inl \
+  Synch_Options.inl \
+  Task_Ex_T.inl \
+  Task.inl \
+  Task_T.inl \
+  Thread.inl \
+  Thread_Manager.inl \
+  Timeprobe.inl \
+  Timer_Queue_Adapters.inl \
+  Timer_Queue_T.inl \
+  TLI_Connector.inl \
+  TLI.inl \
+  TLI_Stream.inl \
+  Token_Collection.inl \
+  Token.inl \
+  Token_Manager.inl \
+  Token_Request_Reply.inl \
+  TP_Reactor.inl \
+  Typed_SV_Message.inl \
+  Typed_SV_Message_Queue.inl \
+  UNIX_Addr.inl \
+  UPIPE_Acceptor.inl \
+  UPIPE_Connector.inl \
+  UPIPE_Stream.inl \
+  Vector_T.inl \
+  WFMO_Reactor.inl \
+  XTI_ATM_Mcast.inl \
   ace_wchar.inl \
   Argv_Type_Converter.inl \
   Array_Base.inl \
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 1c35a3064a6..b0ff605f368 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -6,7 +6,7 @@
 #include "ace/Malloc.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Malloc.i"
+#include "ace/Malloc.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 4e4a38e4865..4fc1b63413f 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -381,7 +381,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Malloc.i"
+#include "ace/Malloc.inl"
 #endif /* __ACE_INLINE__ */
 
 // Include the ACE_Malloc templates and ACE_Memory_Pool classes at this point.
diff --git a/ace/Malloc.i b/ace/Malloc.inl
index 76722f13fb7..76722f13fb7 100644
--- a/ace/Malloc.i
+++ b/ace/Malloc.inl
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index f8db674cd1a..bfa794e1a7f 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -15,7 +15,7 @@
 #include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Malloc_Allocator.i"
+#include "ace/Malloc_Allocator.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Guard_T.h"
diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h
index 10f74f44e6d..4fecb2a3d6a 100644
--- a/ace/Malloc_Allocator.h
+++ b/ace/Malloc_Allocator.h
@@ -134,7 +134,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Malloc_Allocator.i"
+#include "ace/Malloc_Allocator.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.inl
index e360750f9aa..e360750f9aa 100644
--- a/ace/Malloc_Allocator.i
+++ b/ace/Malloc_Allocator.inl
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index d48228d3cb6..47e4ebb3f21 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Malloc_T.i"
+#include "ace/Malloc_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ACE.h"
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 5a7fb2b3e41..ada5fc23236 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -72,9 +72,9 @@ private:
  * this to work properly.
  *
  * This class can be configured flexibly with different types of
- * ACE_LOCK strategies that support the @a ACE_Thread_Mutex, 
- * @a ACE_Thread_Semaphore, @a ACE_Process_Mutex, and @a 
- * ACE_Process_Semaphore constructor API.   
+ * ACE_LOCK strategies that support the @a ACE_Thread_Mutex,
+ * @a ACE_Thread_Semaphore, @a ACE_Process_Mutex, and @a
+ * ACE_Process_Semaphore constructor API.
  *
  * @sa ACE_Dynamic_Cached_Allocator
  */
@@ -135,8 +135,8 @@ private:
  * this to work properly.
  *
  * This class can be configured flexibly with different types of
- * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a 
- * ACE_Process_Mutex constructor API.   
+ * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a
+ * ACE_Process_Mutex constructor API.
  *
  * @sa ACE_Cached_Allocator
  */
@@ -410,7 +410,7 @@ class ACE_Malloc_FIFO_Iterator_T;
  * This class can be configured flexibly with different
  * MEMORY_POOL strategies and different types of ACE_LOCK
  * strategies that support the @a ACE_Thread_Mutex and @a
- * ACE_Process_Mutex constructor API.   
+ * ACE_Process_Mutex constructor API.
  */
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 class ACE_Malloc_T
@@ -664,7 +664,7 @@ private:
  * specialization to create a version that matches the lock strategy's ctor
  * signature.  See ACE_Process_Semaphore and ACE_Thread_Semaphore for
  * examples.
- * 
+ *
  */
 template <class ACE_LOCK>
 class ACE_Malloc_Lock_Adapter_T
@@ -681,8 +681,8 @@ public:
  * @brief LIFO iterator for names stored in Malloc'd memory.
  *
  * This class can be configured flexibly with different types of
- * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a 
- * ACE_Process_Mutex constructor API.   
+ * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a
+ * ACE_Process_Mutex constructor API.
  *
  * Does not support deletions while iteration is occurring.
  */
@@ -749,8 +749,8 @@ private:
  * @brief FIFO iterator for names stored in Malloc'd memory.
  *
  * This class can be configured flexibly with different types of
- * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a 
- * ACE_Process_Mutex constructor API.   
+ * ACE_LOCK strategies that support the @a ACE_Thread_Mutex and @a
+ * ACE_Process_Mutex constructor API.
  *
  * Does not support deletions while iteration is occurring.
  */
@@ -876,7 +876,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Malloc_T.i"
+#include "ace/Malloc_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Malloc_T.i b/ace/Malloc_T.inl
index b24436fb868..b24436fb868 100644
--- a/ace/Malloc_T.i
+++ b/ace/Malloc_T.inl
diff --git a/ace/Managed_Object.cpp b/ace/Managed_Object.cpp
index 1ca8fc31f18..cd798b2216d 100644
--- a/ace/Managed_Object.cpp
+++ b/ace/Managed_Object.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Managed_Object.i"
+#include "ace/Managed_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Managed_Object, "$Id$")
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 4951d7e9381..749425c1aeb 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -147,7 +147,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Managed_Object.i"
+#include "ace/Managed_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Managed_Object.i b/ace/Managed_Object.inl
index d4dd6043418..d4dd6043418 100644
--- a/ace/Managed_Object.i
+++ b/ace/Managed_Object.inl
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 7a1282de834..5c6267f2b5f 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -12,7 +12,7 @@
 #include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Map_Manager.i"
+#include "ace/Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Map_Manager, "$Id$")
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index ffcc9c1219b..79af0088240 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -696,7 +696,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Map_Manager.i"
+#include "ace/Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Map_Manager.i b/ace/Map_Manager.inl
index 7ef6fdfbf3b..7ef6fdfbf3b 100644
--- a/ace/Map_Manager.i
+++ b/ace/Map_Manager.inl
diff --git a/ace/Map_T.cpp b/ace/Map_T.cpp
index e2329089630..2522962f0bc 100644
--- a/ace/Map_T.cpp
+++ b/ace/Map_T.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Map_T.i"
+#include "ace/Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Map_T, "$Id$")
diff --git a/ace/Map_T.h b/ace/Map_T.h
index be6c51797fa..9ff658d4a7d 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -1592,7 +1592,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Map_T.i"
+#include "ace/Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Map_T.i b/ace/Map_T.inl
index e786e1de5bf..e786e1de5bf 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.inl
diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp
index e08b29e213a..493244d2977 100644
--- a/ace/Mem_Map.cpp
+++ b/ace/Mem_Map.cpp
@@ -4,7 +4,7 @@
 
 #include "ace/Mem_Map.h"
 #if !defined (__ACE_INLINE__)
-#include "ace/Mem_Map.i"
+#include "ace/Mem_Map.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_sys_stat.h"
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 4522e2070a2..17e02461878 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -213,7 +213,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Mem_Map.i"
+#include "ace/Mem_Map.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Mem_Map.i b/ace/Mem_Map.inl
index d499a7807d9..d499a7807d9 100644
--- a/ace/Mem_Map.i
+++ b/ace/Mem_Map.inl
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 758c9a7302c..053fa58749f 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -4,7 +4,7 @@
 #include "ace/Memory_Pool.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Memory_Pool.i"
+#include "ace/Memory_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 6f32f7cb1db..521378370b6 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -808,7 +808,7 @@ private:
 #endif /* ACE_WIN32 */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Memory_Pool.i"
+#include "ace/Memory_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Memory_Pool.i b/ace/Memory_Pool.inl
index de87de3b331..de87de3b331 100644
--- a/ace/Memory_Pool.i
+++ b/ace/Memory_Pool.inl
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 047e8789314..97925966fc0 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -1,7 +1,7 @@
 #include "ace/Message_Block.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Block.i"
+#include "ace/Message_Block.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index ca944964392..8ea08caf316 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -1031,7 +1031,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Block.i"
+#include "ace/Message_Block.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Message_Block_T.h"
diff --git a/ace/Message_Block.i b/ace/Message_Block.inl
index 03cf8cde245..03cf8cde245 100644
--- a/ace/Message_Block.i
+++ b/ace/Message_Block.inl
diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp
index e9d62f18dd3..d3120c13e68 100644
--- a/ace/Message_Block_T.cpp
+++ b/ace/Message_Block_T.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(ace, Message_Block_T, "$Id$")
 #include "ace/Malloc_Base.h"     /* Need ACE_Allocator */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Block_T.i"
+#include "ace/Message_Block_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_errno.h"
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index cbf99cf3118..f2f1732c56a 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -68,7 +68,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Block_T.i"
+#include "ace/Message_Block_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Message_Block_T.i b/ace/Message_Block_T.inl
index 279dcaa704d..279dcaa704d 100644
--- a/ace/Message_Block_T.i
+++ b/ace/Message_Block_T.inl
diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 7d7c09fb37b..9d06664b5f2 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -7,7 +7,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Queue.i"
+#include "ace/Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Message_Queue, "$Id$")
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index def844c2c12..dfbd53807c5 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -600,7 +600,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Queue.i"
+#include "ace/Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Message_Queue.i b/ace/Message_Queue.inl
index fa03235d6a7..fa03235d6a7 100644
--- a/ace/Message_Queue.i
+++ b/ace/Message_Queue.inl
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 48c3f0aa164..ff017456769 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -14,7 +14,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.i"
+#include "ace/Message_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Notification_Strategy.h"
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index c728dc70062..429e2c2edf6 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -240,7 +240,7 @@ public:
    * receiving a message -1 is returned and <errno> is set to
    * <EWOULDBLOCK>.  If the queue is deactivated -1 is returned and
    * <errno> is set to <ESHUTDOWN>.  Otherwise, returns -1 on failure,
-   * else the number of items still on the queue.  
+   * else the number of items still on the queue.
    */
   virtual int dequeue_prio (ACE_Message_Block *&first_item,
                             ACE_Time_Value *timeout = 0);
@@ -1225,7 +1225,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Message_Queue_T.i"
+#include "ace/Message_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.inl
index 3cd1e3cd719..3cd1e3cd719 100644
--- a/ace/Message_Queue_T.i
+++ b/ace/Message_Queue_T.inl
diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp
index 20ac9a6dc57..de520773da7 100644
--- a/ace/Metrics_Cache_T.cpp
+++ b/ace/Metrics_Cache_T.cpp
@@ -228,7 +228,7 @@ flush_ACE_Metrics_Cache ()
 
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Metrics_Cache_T.i"
+#include "ace/Metrics_Cache_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* defined (ACE_COMPILE_TIMEPROBES) */
diff --git a/ace/Metrics_Cache_T.h b/ace/Metrics_Cache_T.h
index 3a95b74f6a4..d101ae734b8 100644
--- a/ace/Metrics_Cache_T.h
+++ b/ace/Metrics_Cache_T.h
@@ -221,7 +221,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Metrics_Cache_T.i"
+#include "ace/Metrics_Cache_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Metrics_Cache_T.i b/ace/Metrics_Cache_T.inl
index 6d48c917059..6d48c917059 100644
--- a/ace/Metrics_Cache_T.i
+++ b/ace/Metrics_Cache_T.inl
diff --git a/ace/Module.cpp b/ace/Module.cpp
index 5e4646ef8c4..ef101352e0b 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -13,7 +13,7 @@
 #include "ace/Stream_Modules.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Module.i"
+#include "ace/Module.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Module, "$Id$")
diff --git a/ace/Module.h b/ace/Module.h
index c8b7bdda60c..8f9c78e8228 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -193,7 +193,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Module.i"
+#include "ace/Module.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Module.i b/ace/Module.inl
index ba93e8e5df7..ba93e8e5df7 100644
--- a/ace/Module.i
+++ b/ace/Module.inl
diff --git a/ace/Msg_WFMO_Reactor.cpp b/ace/Msg_WFMO_Reactor.cpp
index deac06f6226..dfe86740efc 100644
--- a/ace/Msg_WFMO_Reactor.cpp
+++ b/ace/Msg_WFMO_Reactor.cpp
@@ -7,10 +7,10 @@ ACE_RCSID(ace, Msg_WFMO_Reactor, "$Id$")
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Msg_WFMO_Reactor.i"
+#include "ace/Msg_WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (ACE_Sig_Handler *sh, 
+ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (ACE_Sig_Handler *sh,
                                             ACE_Timer_Queue *tq)
   : ACE_WFMO_Reactor (sh, tq)
 {
@@ -58,7 +58,7 @@ ACE_Msg_WFMO_Reactor::dispatch_window_messages (void)
 {
   int number_of_messages = 0;
   MSG msg;
-      
+
   // Process all pending message from this thread's message queue
   while (::PeekMessage (&msg, 0, 0, 0, PM_REMOVE))
     {
@@ -66,14 +66,14 @@ ACE_Msg_WFMO_Reactor::dispatch_window_messages (void)
       if (msg.message == WM_QUIT)
         {
           // Should inform the main thread
-          ::PostQuitMessage (msg.wParam); 
+          ::PostQuitMessage (msg.wParam);
           return -1;
         }
-      
+
       ::DispatchMessage (&msg);
       number_of_messages++;
     }
-  
+
   return number_of_messages;
 }
 
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index ae1ad199919..16e414ce1d2 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -109,7 +109,7 @@ protected:
 #endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Msg_WFMO_Reactor.i"
+#include "ace/Msg_WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Msg_WFMO_Reactor.i b/ace/Msg_WFMO_Reactor.inl
index c8d7f25c8d7..c8d7f25c8d7 100644
--- a/ace/Msg_WFMO_Reactor.i
+++ b/ace/Msg_WFMO_Reactor.inl
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp
index 6bd18e8a502..b9258687a99 100644
--- a/ace/Multihomed_INET_Addr.cpp
+++ b/ace/Multihomed_INET_Addr.cpp
@@ -6,7 +6,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#  include "ace/Multihomed_INET_Addr.i"
+#  include "ace/Multihomed_INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h
index d5e9dffcc76..dd3b2f45908 100644
--- a/ace/Multihomed_INET_Addr.h
+++ b/ace/Multihomed_INET_Addr.h
@@ -155,7 +155,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#  include "ace/Multihomed_INET_Addr.i"
+#  include "ace/Multihomed_INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Multihomed_INET_Addr.i b/ace/Multihomed_INET_Addr.inl
index 71ec578a177..71ec578a177 100644
--- a/ace/Multihomed_INET_Addr.i
+++ b/ace/Multihomed_INET_Addr.inl
diff --git a/ace/Multiplexor.cpp b/ace/Multiplexor.cpp
index e4d33295b31..12a4148378f 100644
--- a/ace/Multiplexor.cpp
+++ b/ace/Multiplexor.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(ace, Multiplexor, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Multiplexor.i"
+#include "ace/Multiplexor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index 803232021de..12336afaac9 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -71,7 +71,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Multiplexor.i"
+#include "ace/Multiplexor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* 0 */
diff --git a/ace/Multiplexor.i b/ace/Multiplexor.inl
index 18e022ac911..18e022ac911 100644
--- a/ace/Multiplexor.i
+++ b/ace/Multiplexor.inl
diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp
index b45f22ce3ac..7a60f27fdaf 100644
--- a/ace/NT_Service.cpp
+++ b/ace/NT_Service.cpp
@@ -7,7 +7,7 @@
 #include "ace/NT_Service.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/NT_Service.i"
+#include "ace/NT_Service.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index aaa225eb4a8..5f7c206e405 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -335,7 +335,7 @@ protected:
    * reached or the service doesn't update its state any further.  The
    * svc_status_ class member is updated upon return.
    */
-  void wait_for_service_state (DWORD desired_state, 
+  void wait_for_service_state (DWORD desired_state,
                                ACE_Time_Value *wait_time);
 
   /// Called by <handle_control> when a stop/shutdown was requested.
@@ -425,7 +425,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                \
   int RET = ACE_TEXT_StartServiceCtrlDispatcher(_ace_nt_svc_table);
 
 #if defined (__ACE_INLINE__)
-#include "ace/NT_Service.i"
+#include "ace/NT_Service.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_WIN32 && !ACE_HAS_PHARLAP && !ACE_HAS_WINCE */
diff --git a/ace/NT_Service.i b/ace/NT_Service.inl
index a1a9e9469b8..a1a9e9469b8 100644
--- a/ace/NT_Service.i
+++ b/ace/NT_Service.inl
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 112039cbd7b..d90d4db5a8a 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -10,7 +10,7 @@
 // Perhaps we should *always* include ace/OS.i in order to make sure
 // we can always link against the OS symbols?
 #if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS.i"
+# include "ace/OS.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
 ACE_RCSID(ace, OS, "$Id$")
diff --git a/ace/OS.h b/ace/OS.h
index ccad3880e70..cefc33adf9e 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -376,7 +376,7 @@ namespace ACE_OS
 #     undef ACE_INLINE
 #   endif /* ACE_INLINE */
 #   define ACE_INLINE inline
-#   include "ace/OS.i"
+#   include "ace/OS.inl"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
 #if defined (ACE_LEGACY_MODE)
diff --git a/ace/OS.i b/ace/OS.inl
index 39dad0b3df4..39dad0b3df4 100644
--- a/ace/OS.i
+++ b/ace/OS.inl
diff --git a/ace/Obchunk.cpp b/ace/Obchunk.cpp
index 8ed416c8b68..60a7f9b7a37 100644
--- a/ace/Obchunk.cpp
+++ b/ace/Obchunk.cpp
@@ -3,7 +3,7 @@
 #include "ace/Obchunk.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Obchunk.i"
+#include "ace/Obchunk.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Obchunk, "$Id$")
diff --git a/ace/Obchunk.h b/ace/Obchunk.h
index 5b8d4720161..d901c030dd2 100644
--- a/ace/Obchunk.h
+++ b/ace/Obchunk.h
@@ -65,7 +65,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Obchunk.i"
+#include "ace/Obchunk.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Obchunk.i b/ace/Obchunk.inl
index bffb7626155..bffb7626155 100644
--- a/ace/Obchunk.i
+++ b/ace/Obchunk.inl
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 36e098f9f5b..4b69f1c113a 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -18,7 +18,7 @@
 #include "ace/Atomic_Op.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Object_Manager.i"
+# include "ace/Object_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Guard_T.h"
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 9ed510bd1ff..4fa9325ef0c 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -427,7 +427,7 @@ private:
 #include "ace/Static_Object_Lock.h"
 
 #if defined (__ACE_INLINE__)
-#include "ace/Object_Manager.i"
+#include "ace/Object_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Managed_Object.h"
diff --git a/ace/Object_Manager.i b/ace/Object_Manager.inl
index 19ba4079a9c..19ba4079a9c 100644
--- a/ace/Object_Manager.i
+++ b/ace/Object_Manager.inl
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index fc734c7de01..b32171b7337 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Obstack_T.i"
+#include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Obstack_T, "$Id$")
diff --git a/ace/Obstack_T.h b/ace/Obstack_T.h
index b24da819907..d0c082b83f2 100644
--- a/ace/Obstack_T.h
+++ b/ace/Obstack_T.h
@@ -110,7 +110,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Obstack_T.i"
+#include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Obstack_T.i b/ace/Obstack_T.inl
index 57e049ef1ea..57e049ef1ea 100644
--- a/ace/Obstack_T.i
+++ b/ace/Obstack_T.inl
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
index 3d2767e9c3f..fbe0d925e6f 100644
--- a/ace/PI_Malloc.cpp
+++ b/ace/PI_Malloc.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (ace,
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/PI_Malloc.i"
+#include "ace/PI_Malloc.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h
index 0b516abfdef..4dbb3a370ad 100644
--- a/ace/PI_Malloc.h
+++ b/ace/PI_Malloc.h
@@ -191,7 +191,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/PI_Malloc.i"
+#include "ace/PI_Malloc.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/PI_Malloc.i b/ace/PI_Malloc.inl
index b082b523618..b082b523618 100644
--- a/ace/PI_Malloc.i
+++ b/ace/PI_Malloc.inl
diff --git a/ace/POSIX_CB_Proactor.cpp b/ace/POSIX_CB_Proactor.cpp
index c8156646e13..afae1751103 100644
--- a/ace/POSIX_CB_Proactor.cpp
+++ b/ace/POSIX_CB_Proactor.cpp
@@ -11,7 +11,7 @@
 #include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/POSIX_CB_Proactor.i"
+#include "ace/POSIX_CB_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_POSIX_CB_Proactor::ACE_POSIX_CB_Proactor (size_t max_aio_operations)
diff --git a/ace/POSIX_CB_Proactor.h b/ace/POSIX_CB_Proactor.h
index 1516795b91f..e5509870f8f 100644
--- a/ace/POSIX_CB_Proactor.h
+++ b/ace/POSIX_CB_Proactor.h
@@ -86,14 +86,14 @@ protected:
    * dispatched. Return -1 on errors.
    */
   int handle_events_i (u_long milli_seconds);
- 
+
   /// semaphore variable to notify
   /// used to wait the first AIO start
   ACE_SYNCH_SEMAPHORE sema_;
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/POSIX_CB_Proactor.i"
+#include "ace/POSIX_CB_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__  */
diff --git a/ace/POSIX_CB_Proactor.i b/ace/POSIX_CB_Proactor.inl
index 5e6be74df26..5e6be74df26 100644
--- a/ace/POSIX_CB_Proactor.i
+++ b/ace/POSIX_CB_Proactor.inl
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 1784809ad45..2e809ec9eba 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -6,7 +6,7 @@
 #if defined (ACE_HAS_AIO_CALLS)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
+#include "ace/POSIX_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 # if defined (ACE_HAS_SYSINFO)
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 0b706f841c9..a86c5be69cb 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -622,7 +622,7 @@ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result
   /// The factory method for this class is with the POSIX_Proactor
   /// class.
   friend class ACE_POSIX_Proactor;
-#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) 
+#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS)
   friend class ACE_POSIX_SIG_Proactor;
 #endif
 
@@ -649,7 +649,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
+#include "ace/POSIX_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS  && ACE_HAS_POSIX_REALTIME_SIGNALS */
diff --git a/ace/POSIX_Proactor.i b/ace/POSIX_Proactor.inl
index c5e80b49943..c5e80b49943 100644
--- a/ace/POSIX_Proactor.i
+++ b/ace/POSIX_Proactor.inl
diff --git a/ace/Pair_T.cpp b/ace/Pair_T.cpp
index 27e7f6d34df..eb4e10b33ac 100644
--- a/ace/Pair_T.cpp
+++ b/ace/Pair_T.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Pair_T.i"
+#include "ace/Pair_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Pair_T, "$Id$")
diff --git a/ace/Pair_T.h b/ace/Pair_T.h
index 4ded87dbfcf..37147794fd9 100644
--- a/ace/Pair_T.h
+++ b/ace/Pair_T.h
@@ -110,7 +110,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Pair_T.i"
+#include "ace/Pair_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Pair_T.i b/ace/Pair_T.inl
index dafbb222cca..dafbb222cca 100644
--- a/ace/Pair_T.i
+++ b/ace/Pair_T.inl
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 6c7eefac2ea..4783472d48e 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -3,7 +3,7 @@
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Parse_Node.i"
+#include "ace/Parse_Node.inl"
 #endif /* ____ */
 
 #include "ace/Service_Config.h"
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index b9ed6f4dbf8..8b44bfe4d99 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -367,7 +367,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "ace/Parse_Node.i"
+#include "ace/Parse_Node.inl"
 #endif /* __ACE_INLINE__ */
 
 /// Global variable used to communicate between the parser and the main
diff --git a/ace/Parse_Node.i b/ace/Parse_Node.inl
index 538ca6ee430..538ca6ee430 100644
--- a/ace/Parse_Node.i
+++ b/ace/Parse_Node.inl
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index befb32285ff..7f0ef736814 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_sys_socket.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Pipe.i"
+#include "ace/Pipe.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Pipe, "$Id$")
diff --git a/ace/Pipe.h b/ace/Pipe.h
index 2da7e685f6b..8316820d356 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -82,7 +82,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Pipe.i"
+#include "ace/Pipe.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Pipe.i b/ace/Pipe.inl
index 64a5ee4049c..64a5ee4049c 100644
--- a/ace/Pipe.i
+++ b/ace/Pipe.inl
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 5bfb3e4c092..6a6d0979e9c 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(ace, Proactor, "$Id$")
 #endif /* ACE_HAS_AIO_CALLS */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Proactor.i"
+#include "ace/Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Auto_Event.h"
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 6296d7dc4c2..b78142619b7 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -633,7 +633,7 @@ private:
 };
 
 #  if defined (__ACE_INLINE__)
-#    include "ace/Proactor.i"
+#    include "ace/Proactor.inl"
 #  endif /* __ACE_INLINE__ */
 
 #else /* NOT WIN32 or POSIX with AIO features. */
diff --git a/ace/Proactor.i b/ace/Proactor.inl
index c4c29697efc..c4c29697efc 100644
--- a/ace/Proactor.i
+++ b/ace/Proactor.inl
diff --git a/ace/Process.cpp b/ace/Process.cpp
index 492d664ce5a..e7c784a6c6b 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -3,7 +3,7 @@
 #include "ace/Process.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Process.i"
+#include "ace/Process.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ARGV.h"
diff --git a/ace/Process.h b/ace/Process.h
index 3124fad7cd9..7f1685f4ef9 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -600,7 +600,7 @@ private:
 #include "ace/SString.h"
 
 #if defined (__ACE_INLINE__)
-#include "ace/Process.i"
+#include "ace/Process.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Process.i b/ace/Process.inl
index cf0c17b6f60..cf0c17b6f60 100644
--- a/ace/Process.i
+++ b/ace/Process.inl
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 1c765247878..c51ec494015 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -4,7 +4,7 @@
 #include "ace/Process_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Process_Manager.i"
+#include "ace/Process_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ACE.h"
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index df4d85ac8b5..b58d1539258 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -395,7 +395,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Process_Manager.i"
+#include "ace/Process_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Process_Manager.i b/ace/Process_Manager.inl
index c6ee1f25260..c6ee1f25260 100644
--- a/ace/Process_Manager.i
+++ b/ace/Process_Manager.inl
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index e29ac84d943..2d7370449b1 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -3,7 +3,7 @@
 #include "ace/Profile_Timer.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Profile_Timer.i"
+# include "ace/Profile_Timer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 67c81596c12..e7475a0c586 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -131,7 +131,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Profile_Timer.i"
+# include "ace/Profile_Timer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Profile_Timer.i b/ace/Profile_Timer.inl
index b4070d3250c..b4070d3250c 100644
--- a/ace/Profile_Timer.i
+++ b/ace/Profile_Timer.inl
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 5682971182e..e819ad5d5ac 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -13,7 +13,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/RB_Tree.i"
+#include "ace/RB_Tree.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 4d7cfa852fd..44f13416005 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -848,7 +848,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/RB_Tree.i"
+#include "ace/RB_Tree.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.inl
index d90f3c5b8a6..d90f3c5b8a6 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.inl
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index c58bb41496a..eec9855a892 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -31,7 +31,7 @@
 #include "ace/Recursive_Thread_Mutex.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Reactor.i"
+#include "ace/Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Reactor, "$Id$")
diff --git a/ace/Reactor.h b/ace/Reactor.h
index f55b9d89eda..d7cc5461a4d 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -846,7 +846,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Reactor.i"
+#include "ace/Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Reactor.i b/ace/Reactor.inl
index 8ecd5261b3f..8ecd5261b3f 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.inl
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index f576c3e1db0..0921d83ea0c 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -3,7 +3,7 @@
 #include "ace/Read_Buffer.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Read_Buffer.i"
+#include "ace/Read_Buffer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 480e392a2f1..f1075c70901 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- *  @author Seth Widoff 
+ *  @author Seth Widoff
  */
 //==========================================================================
 
@@ -115,7 +115,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Read_Buffer.i"
+# include "ace/Read_Buffer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Read_Buffer.i b/ace/Read_Buffer.inl
index 3534c62db2e..3534c62db2e 100644
--- a/ace/Read_Buffer.i
+++ b/ace/Read_Buffer.inl
diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h
index 7de2186c06b..620ef555cfb 100644
--- a/ace/Refcounted_Auto_Ptr.h
+++ b/ace/Refcounted_Auto_Ptr.h
@@ -187,7 +187,7 @@ private:
   ~ACE_Refcounted_Auto_Ptr_Rep (void);
 };
 
-#include "ace/Refcounted_Auto_Ptr.i"
+#include "ace/Refcounted_Auto_Ptr.inl"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_REFCOUNTED_AUTO_PTR_H */
diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.inl
index 47c18678dfe..47c18678dfe 100644
--- a/ace/Refcounted_Auto_Ptr.i
+++ b/ace/Refcounted_Auto_Ptr.inl
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index a60aab73cc8..36c0d98e156 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -5,7 +5,7 @@
 #include "ace/Singleton.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Remote_Tokens.i"
+#include "ace/Remote_Tokens.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 572300fe469..d9310592f7f 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -309,7 +309,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Remote_Tokens.i"
+#include "ace/Remote_Tokens.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Remote_Tokens.i b/ace/Remote_Tokens.inl
index f0cc90e5105..f0cc90e5105 100644
--- a/ace/Remote_Tokens.i
+++ b/ace/Remote_Tokens.inl
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 67730926db7..64bb4bc0210 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK.i"
+#include "ace/SOCK.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK, "$Id$")
diff --git a/ace/SOCK.h b/ace/SOCK.h
index b4e69d16e3c..beb700ca8a2 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -114,7 +114,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK.i"
+#include "ace/SOCK.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK.i b/ace/SOCK.inl
index f35fda782d1..f35fda782d1 100644
--- a/ace/SOCK.i
+++ b/ace/SOCK.inl
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index b7c3b5fd80d..59400f58578 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -9,7 +9,7 @@
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Acceptor.i"
+#include "ace/SOCK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #if !defined (ACE_HAS_WINCE)
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index d68a3294482..2c769faa86a 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -167,7 +167,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Acceptor.i"
+#include "ace/SOCK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Acceptor.i b/ace/SOCK_Acceptor.inl
index db6fa00f4ba..db6fa00f4ba 100644
--- a/ace/SOCK_Acceptor.i
+++ b/ace/SOCK_Acceptor.inl
diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp
index 4eb2ba7c21b..766819b1eb1 100644
--- a/ace/SOCK_CODgram.cpp
+++ b/ace/SOCK_CODgram.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_sys_socket.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_CODgram.i"
+#include "ace/SOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_CODgram, "$Id$")
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 02bea58a4d6..a8ec8479166 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -66,7 +66,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_CODgram.i"
+#include "ace/SOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_CODgram.i b/ace/SOCK_CODgram.inl
index a921bb5df5a..a921bb5df5a 100644
--- a/ace/SOCK_CODgram.i
+++ b/ace/SOCK_CODgram.inl
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 6a1bd9fae6b..fe7fa79103d 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -13,7 +13,7 @@
 #endif  // ACE_HAS_WINCE
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Connector.i"
+#include "ace/SOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_Connector, "$Id$")
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index c2b39026b23..c3395fd3c82 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -318,7 +318,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Connector.i"
+#include "ace/SOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.inl
index 423ffcd942e..423ffcd942e 100644
--- a/ace/SOCK_Connector.i
+++ b/ace/SOCK_Connector.inl
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index abecdef94b3..50c5f571f5b 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -10,7 +10,7 @@
 #include "ace/os_include/net/os_if.h"
 
 #if !defined (__ACE_INLINE__)
-#  include "ace/SOCK_Dgram.i"
+#  include "ace/SOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index 23947fc0f7b..1261d199418 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -212,7 +212,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Dgram.i"
+#include "ace/SOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.inl
index 8e7cd56aa69..8e7cd56aa69 100644
--- a/ace/SOCK_Dgram.i
+++ b/ace/SOCK_Dgram.inl
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index ddfcb1f407a..67e6507ab23 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -10,7 +10,7 @@
 #include "ace/OS_Memory.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Dgram_Bcast.i"
+#include "ace/SOCK_Dgram_Bcast.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$")
@@ -223,7 +223,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                          (char *) &flags) == -1)
         {
           ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-						 "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)", 
+						 "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)",
 						 flags.ifr_name));
           continue;
         }
@@ -265,7 +265,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
         {
           if (host_name != 0)
             ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-                        "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface.", 
+                        "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface.",
                         flags.ifr_name));
         }
     }
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index 5b72a117d70..d5ed848e1e9 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -128,7 +128,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Dgram_Bcast.i"
+#include "ace/SOCK_Dgram_Bcast.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Dgram_Bcast.i b/ace/SOCK_Dgram_Bcast.inl
index 85c3312ef9d..85c3312ef9d 100644
--- a/ace/SOCK_Dgram_Bcast.i
+++ b/ace/SOCK_Dgram_Bcast.inl
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 58c495a984c..aa1d96803fa 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -8,7 +8,7 @@
 #include "ace/os_include/arpa/os_inet.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Dgram_Mcast.i"
+#include "ace/SOCK_Dgram_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 8c1bce01b7f..c4d55ab2314 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -431,7 +431,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Dgram_Mcast.i"
+#include "ace/SOCK_Dgram_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.inl
index 3244f21b078..3244f21b078 100644
--- a/ace/SOCK_Dgram_Mcast.i
+++ b/ace/SOCK_Dgram_Mcast.inl
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index b2baf3155cf..cdc12148bde 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_Memory.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_IO.i"
+#include "ace/SOCK_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_IO, "$Id$")
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index b5deb3ab3f8..b85e54381cc 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -139,7 +139,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_IO.i"
+#include "ace/SOCK_IO.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.inl
index 32c3b618893..32c3b618893 100644
--- a/ace/SOCK_IO.i
+++ b/ace/SOCK_IO.inl
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index 83578a0904a..dd83e92e367 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -9,7 +9,7 @@
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Acceptor.i"
+#include "ace/SOCK_SEQPACK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp")
diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h
index 6a313ee4136..45d7a9c9361 100644
--- a/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ace/SOCK_SEQPACK_Acceptor.h
@@ -179,7 +179,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Acceptor.i"
+#include "ace/SOCK_SEQPACK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_SEQPACK_Acceptor.i b/ace/SOCK_SEQPACK_Acceptor.inl
index 39c1700b53c..39c1700b53c 100644
--- a/ace/SOCK_SEQPACK_Acceptor.i
+++ b/ace/SOCK_SEQPACK_Acceptor.inl
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index 719d37d9bfe..a473ae54b9d 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Association.i"
+#include "ace/SOCK_SEQPACK_Association.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$")
diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h
index 65503ff349e..9f25a91e6f0 100644
--- a/ace/SOCK_SEQPACK_Association.h
+++ b/ace/SOCK_SEQPACK_Association.h
@@ -185,7 +185,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Association.i"
+#include "ace/SOCK_SEQPACK_Association.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_SEQPACK_Association.i b/ace/SOCK_SEQPACK_Association.inl
index 3c33c96968e..3c33c96968e 100644
--- a/ace/SOCK_SEQPACK_Association.i
+++ b/ace/SOCK_SEQPACK_Association.inl
diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp
index 02ac05b6ce6..d8f35d79360 100644
--- a/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ace/SOCK_SEQPACK_Connector.cpp
@@ -14,7 +14,7 @@
 #endif /* ACE_WIN32 */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Connector.i"
+#include "ace/SOCK_SEQPACK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp")
diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h
index 7223c93071e..af75a23b963 100644
--- a/ace/SOCK_SEQPACK_Connector.h
+++ b/ace/SOCK_SEQPACK_Connector.h
@@ -319,7 +319,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_SEQPACK_Connector.i"
+#include "ace/SOCK_SEQPACK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_SEQPACK_Connector.i b/ace/SOCK_SEQPACK_Connector.inl
index 6450abb6ce9..6450abb6ce9 100644
--- a/ace/SOCK_SEQPACK_Connector.i
+++ b/ace/SOCK_SEQPACK_Connector.inl
diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp
index 0ed2cd309b7..eda799e0ee6 100644
--- a/ace/SOCK_Stream.cpp
+++ b/ace/SOCK_Stream.cpp
@@ -4,7 +4,7 @@
 #include "ace/SOCK_Stream.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SOCK_Stream.i"
+#include "ace/SOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SOCK_Stream, "$Id$")
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 701cbcffca3..fe232f4ac6d 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -160,7 +160,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SOCK_Stream.i"
+#include "ace/SOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SOCK_Stream.i b/ace/SOCK_Stream.inl
index 5ba88bc55c5..5ba88bc55c5 100644
--- a/ace/SOCK_Stream.i
+++ b/ace/SOCK_Stream.inl
diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp
index cbc04e56bc0..a87967a6249 100644
--- a/ace/SPIPE.cpp
+++ b/ace/SPIPE.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SPIPE.i"
+#include "ace/SPIPE.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SPIPE, "$Id$")
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index d8fa5f3a79a..9524698baa2 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -93,7 +93,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SPIPE.i"
+#include "ace/SPIPE.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SPIPE.i b/ace/SPIPE.inl
index 2912e4d7493..2912e4d7493 100644
--- a/ace/SPIPE.i
+++ b/ace/SPIPE.inl
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 85dae45be0c..9a0332f052d 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -7,7 +7,7 @@
 #include "ace/os_include/sys/os_socket.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SPIPE_Addr.i"
+#include "ace/SPIPE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SPIPE_Addr, "$Id$")
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index 58a52164c99..ffc150b98cd 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -110,7 +110,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SPIPE_Addr.i"
+#include "ace/SPIPE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SPIPE_Addr.i b/ace/SPIPE_Addr.inl
index 32b83289359..32b83289359 100644
--- a/ace/SPIPE_Addr.i
+++ b/ace/SPIPE_Addr.inl
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 4f89df9e2b6..ffc975cc805 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SPIPE_Connector.i"
+#include "ace/SPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SPIPE_Connector, "$Id$")
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 7143a4626b4..7648e63b4a4 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -107,7 +107,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SPIPE_Connector.i"
+#include "ace/SPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SPIPE_Connector.i b/ace/SPIPE_Connector.inl
index 4ca09d7887e..4ca09d7887e 100644
--- a/ace/SPIPE_Connector.i
+++ b/ace/SPIPE_Connector.inl
diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp
index 3bea7d00e02..40d96974ceb 100644
--- a/ace/SPIPE_Stream.cpp
+++ b/ace/SPIPE_Stream.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_Memory.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SPIPE_Stream.i"
+#include "ace/SPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SPIPE_Stream, "$Id$")
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index a015f493b0b..5146217c529 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -160,7 +160,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SPIPE_Stream.i"
+#include "ace/SPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.inl
index 11b8fef5a9e..11b8fef5a9e 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.inl
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 0ad22eee8c2..1d3bc1c7be3 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -14,7 +14,7 @@
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SString.i"
+#include "ace/SString.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/SString.h b/ace/SString.h
index 7f9ebf852d1..72121f24fc3 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -480,7 +480,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SString.i"
+#include "ace/SString.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SString.i b/ace/SString.inl
index a985c5456af..a985c5456af 100644
--- a/ace/SString.i
+++ b/ace/SString.inl
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index 5c42b2169ff..306ea2485a3 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -10,7 +10,7 @@
 #include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SUN_Proactor.i"
+#include "ace/SUN_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations)
diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h
index 4df6be7a416..a1fbdbd3288 100644
--- a/ace/SUN_Proactor.h
+++ b/ace/SUN_Proactor.h
@@ -119,7 +119,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SUN_Proactor.i"
+#include "ace/SUN_Proactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_AIO_CALLS && sun */
diff --git a/ace/SUN_Proactor.i b/ace/SUN_Proactor.inl
index 545841223aa..545841223aa 100644
--- a/ace/SUN_Proactor.i
+++ b/ace/SUN_Proactor.inl
diff --git a/ace/SV_Message.cpp b/ace/SV_Message.cpp
index 7de4d2e1179..f8ace600ab3 100644
--- a/ace/SV_Message.cpp
+++ b/ace/SV_Message.cpp
@@ -4,7 +4,7 @@
 #include "ace/SV_Message.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SV_Message.i"
+#include "ace/SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SV_Message, "$Id$")
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index 92a0b17c7c7..2151329bd5c 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -54,7 +54,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SV_Message.i"
+#include "ace/SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SV_Message.i b/ace/SV_Message.inl
index 44cd5e25759..44cd5e25759 100644
--- a/ace/SV_Message.i
+++ b/ace/SV_Message.inl
diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp
index 12ca9acabd7..3e57373e18d 100644
--- a/ace/SV_Message_Queue.cpp
+++ b/ace/SV_Message_Queue.cpp
@@ -4,7 +4,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SV_Message_Queue.i"
+#include "ace/SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SV_Message_Queue, "$Id$")
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index 813df564996..e4855ee3e0f 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -93,7 +93,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SV_Message_Queue.i"
+#include "ace/SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SV_Message_Queue.i b/ace/SV_Message_Queue.inl
index afebb74a226..afebb74a226 100644
--- a/ace/SV_Message_Queue.i
+++ b/ace/SV_Message_Queue.inl
diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp
index 84ec4681acf..8c827e97b42 100644
--- a/ace/SV_Semaphore_Complex.cpp
+++ b/ace/SV_Semaphore_Complex.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_Thread.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SV_Semaphore_Complex.i"
+#include "ace/SV_Semaphore_Complex.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SV_Semaphore_Complex, "$Id$")
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 88e9fa3008c..6278fb694c9 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -148,7 +148,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SV_Semaphore_Complex.i"
+#include "ace/SV_Semaphore_Complex.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SV_Semaphore_Complex.i b/ace/SV_Semaphore_Complex.inl
index 00c3450c1bd..00c3450c1bd 100644
--- a/ace/SV_Semaphore_Complex.i
+++ b/ace/SV_Semaphore_Complex.inl
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 39f0107f640..f54a843cc96 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -4,7 +4,7 @@
 #include "ace/os_include/sys/os_sem.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SV_Semaphore_Simple.i"
+#include "ace/SV_Semaphore_Simple.inl"
 #endif /* !__ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index d7b6e32fcb2..d6d28374434 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -169,7 +169,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SV_Semaphore_Simple.i"
+#include "ace/SV_Semaphore_Simple.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SV_Semaphore_Simple.i b/ace/SV_Semaphore_Simple.inl
index a6490c18ac8..a6490c18ac8 100644
--- a/ace/SV_Semaphore_Simple.i
+++ b/ace/SV_Semaphore_Simple.inl
diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp
index 7bf96fb1d6f..5a9d33e934f 100644
--- a/ace/SV_Shared_Memory.cpp
+++ b/ace/SV_Shared_Memory.cpp
@@ -5,7 +5,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/SV_Shared_Memory.i"
+#include "ace/SV_Shared_Memory.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, SV_Shared_Memory, "$Id$")
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index 63d72c4fa1c..147072e7e98 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -110,7 +110,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/SV_Shared_Memory.i"
+#include "ace/SV_Shared_Memory.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/SV_Shared_Memory.i b/ace/SV_Shared_Memory.inl
index f01f5b2c969..f01f5b2c969 100644
--- a/ace/SV_Shared_Memory.i
+++ b/ace/SV_Shared_Memory.inl
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index e0a2e14b0b9..21c10034531 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -19,7 +19,7 @@
 #include "ace/Sched_Params.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Sched_Params.i"
+#include "ace/Sched_Params.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS)
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index d5776449a2d..c68e701f9b4 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -221,7 +221,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Sched_Params.i"
+#include "ace/Sched_Params.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Sched_Params.i b/ace/Sched_Params.inl
index 041f9cb1648..041f9cb1648 100644
--- a/ace/Sched_Params.i
+++ b/ace/Sched_Params.inl
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index a4a6fe36eac..1fc1e58b5af 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Select_Reactor_Base.i"
+#include "ace/Select_Reactor_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index 8ad0fd239b0..bdfecee4729 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -542,7 +542,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Select_Reactor_Base.i"
+#include "ace/Select_Reactor_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Select_Reactor_Base.i b/ace/Select_Reactor_Base.inl
index 73c4b7faa21..73c4b7faa21 100644
--- a/ace/Select_Reactor_Base.i
+++ b/ace/Select_Reactor_Base.inl
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 15f7193728c..eb2216ab0fc 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -25,7 +25,7 @@
 // function here.  Therefore, we temporarily disable the code here.
 // We shall turn this back on once we know the problem gets fixed.
 #if 1 // !defined (__ACE_INLINE__)
-#include "ace/Select_Reactor_T.i"
+#include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index e4882bd7944..892592ee0aa 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -771,7 +771,7 @@ private:
 // function here.  Therefore, we temporarily disable the code here.
 // We shall turn this back on once we know the problem gets fixed.
 #if 0 // defined (__ACE_INLINE__)
-#include "ace/Select_Reactor_T.i"
+#include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Select_Reactor_T.i b/ace/Select_Reactor_T.inl
index f82fdce2974..f82fdce2974 100644
--- a/ace/Select_Reactor_T.i
+++ b/ace/Select_Reactor_T.inl
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 597b4bc0abc..bd83cf8df7e 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -3,7 +3,7 @@
 #include "ace/Service_Config.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Config.i"
+#include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Svc_Conf.h"
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 0bb29ffa1ea..bbc73166a02 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -445,7 +445,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Config.i"
+#include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
 
 // These must go here to avoid circular includes...  (only left here
diff --git a/ace/Service_Config.i b/ace/Service_Config.inl
index 3884ab7da34..3884ab7da34 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.inl
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 36ad46e3893..6e185d1940c 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -1,7 +1,7 @@
 #include "ace/Service_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Manager.i"
+#include "ace/Service_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Get_Opt.h"
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index f7605222473..f2805abe74a 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -33,13 +33,13 @@
  * This implementation is simple and just handles each client
  * request one at a time.  There are currently 3 types of requests:
  * + List services: If the string "help" is sent, return a list of all
- *   the services supported by the Service Configurator.  
+ *   the services supported by the Service Configurator.
  * + Reconfigure: If the string "reconfigure" is sent trigger a
- *   reconfiguration, which will re-read the local <svc.conf> file. 
+ *   reconfiguration, which will re-read the local <svc.conf> file.
  * + Process directive: If neither "help" nor "reconfigure" is sent,
  *   simply treat the incoming string as a process directive and pass
  *   it along to <ACE_Service_Config::process_directive>.  This allows
- *   remote configuration via command-line instructions like 
+ *   remote configuration via command-line instructions like
  *   % echo suspend My_Remote_Service | telnet hostname 3911
  *
  * Each request is associated with a new connection, which is closed
@@ -113,7 +113,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Manager.i"
+#include "ace/Service_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Service_Manager.i b/ace/Service_Manager.inl
index f329d08adfb..f329d08adfb 100644
--- a/ace/Service_Manager.i
+++ b/ace/Service_Manager.inl
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index 16f26803532..e92d4119bf5 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -3,7 +3,7 @@
 #include "ace/Service_Object.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Object.i"
+#include "ace/Service_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Service_Types.h"
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 2c8115a51d5..b44fddf9d66 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -168,7 +168,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Object.i"
+#include "ace/Service_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Service_Object.i b/ace/Service_Object.inl
index 5e1b7ae475e..5e1b7ae475e 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.inl
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 5c813b2f67a..a84a4874785 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -3,7 +3,7 @@
 #include "ace/Service_Repository.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Repository.i"
+#include "ace/Service_Repository.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Service_Types.h"
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index da7dad8e414..48b13290f5a 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -207,7 +207,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Repository.i"
+#include "ace/Service_Repository.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Service_Repository.i b/ace/Service_Repository.inl
index 6872433596e..6872433596e 100644
--- a/ace/Service_Repository.i
+++ b/ace/Service_Repository.inl
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index f2be2b635d6..fb0b13c1837 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -3,7 +3,7 @@
 #include "ace/Service_Types.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Types.i"
+#include "ace/Service_Types.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Stream_Modules.h"
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index 10f05cfdfbd..ef489e851fa 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -190,7 +190,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Service_Types.i"
+#include "ace/Service_Types.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Service_Types.i b/ace/Service_Types.inl
index 480983cfe61..480983cfe61 100644
--- a/ace/Service_Types.i
+++ b/ace/Service_Types.inl
diff --git a/ace/Shared_Memory_MM.cpp b/ace/Shared_Memory_MM.cpp
index 53b260fe399..fac4fc964c2 100644
--- a/ace/Shared_Memory_MM.cpp
+++ b/ace/Shared_Memory_MM.cpp
@@ -4,7 +4,7 @@
 #include "ace/Shared_Memory_MM.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Shared_Memory_MM.i"
+#include "ace/Shared_Memory_MM.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Shared_Memory_MM, "$Id$")
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 0e6f414263d..be610b0bc23 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -109,7 +109,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Shared_Memory_MM.i"
+#include "ace/Shared_Memory_MM.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Shared_Memory_MM.i b/ace/Shared_Memory_MM.inl
index 0c6b18d8aba..0c6b18d8aba 100644
--- a/ace/Shared_Memory_MM.i
+++ b/ace/Shared_Memory_MM.inl
diff --git a/ace/Shared_Memory_SV.cpp b/ace/Shared_Memory_SV.cpp
index f3bcf4653e1..8b530fd7462 100644
--- a/ace/Shared_Memory_SV.cpp
+++ b/ace/Shared_Memory_SV.cpp
@@ -4,7 +4,7 @@
 #include "ace/Shared_Memory_SV.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Shared_Memory_SV.i"
+#include "ace/Shared_Memory_SV.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Shared_Memory_SV, "$Id$")
@@ -20,10 +20,10 @@ ACE_Shared_Memory_SV::dump (void) const
 }
 
 ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
-					    int length, 
-					    int create, 
-					    int perms, 
-					    void *addr, 
+					    int length,
+					    int create,
+					    int perms,
+					    void *addr,
 					    int flags)
   : shared_memory_ (id, length, create, perms, addr, flags)
 {
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 826fbd9305f..4ec2c5def16 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -90,7 +90,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Shared_Memory_SV.i"
+#include "ace/Shared_Memory_SV.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Shared_Memory_SV.i b/ace/Shared_Memory_SV.inl
index 7f9d6d963fd..7f9d6d963fd 100644
--- a/ace/Shared_Memory_SV.i
+++ b/ace/Shared_Memory_SV.inl
diff --git a/ace/Shared_Object.cpp b/ace/Shared_Object.cpp
index 19ebd073475..596bdbc3bd9 100644
--- a/ace/Shared_Object.cpp
+++ b/ace/Shared_Object.cpp
@@ -8,7 +8,7 @@
    facilities */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Shared_Object.i"
+#include "ace/Shared_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index 4aa14d391aa..006dbb99eaf 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -47,7 +47,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Shared_Object.i"
+#include "ace/Shared_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Shared_Object.i b/ace/Shared_Object.inl
index 36a42157cb2..36a42157cb2 100644
--- a/ace/Shared_Object.i
+++ b/ace/Shared_Object.inl
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 9d5f219d01a..5c156bc3029 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -8,7 +8,7 @@
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Signal.i"
+#include "ace/Signal.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Signal, "$Id$")
diff --git a/ace/Signal.h b/ace/Signal.h
index 0d5f39fa63e..f2da538ffa1 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -515,7 +515,7 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context);
 #endif /* ACE_HAS_SIG_C_FUNC */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Signal.i"
+#include "ace/Signal.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Signal.i b/ace/Signal.inl
index c647fb8d18a..c647fb8d18a 100644
--- a/ace/Signal.i
+++ b/ace/Signal.inl
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 34c71c546af..51cf255b4c9 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Singleton.i"
+#include "ace/Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 5e94ba1396b..57b0a8a9d75 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -22,7 +22,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
-#include "ace/TSS_T.h"  
+#include "ace/TSS_T.h"
 #include "ace/Cleanup.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -309,7 +309,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Singleton.i"
+#include "ace/Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Singleton.i b/ace/Singleton.inl
index 12dfe1bdda3..12dfe1bdda3 100644
--- a/ace/Singleton.i
+++ b/ace/Singleton.inl
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index 74bbe672862..b49f108fa27 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -3,7 +3,7 @@
 #include "ace/Stats.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Stats.i"
+# include "ace/Stats.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/High_Res_Timer.h"
diff --git a/ace/Stats.h b/ace/Stats.h
index d228f8fa07f..886da79f10a 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -264,7 +264,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-# include "ace/Stats.i"
+# include "ace/Stats.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Stats.i b/ace/Stats.inl
index bafa86161e8..bafa86161e8 100644
--- a/ace/Stats.i
+++ b/ace/Stats.inl
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index fcb6bf1f87c..2b5ab69b28d 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -17,7 +17,7 @@
 #include "ace/OS_Errno.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Strategies_T.i"
+#include "ace/Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index cf57c0b61bc..f2a4212b977 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -1056,7 +1056,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Strategies_T.i"
+#include "ace/Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.inl
index 41f625a2063..41f625a2063 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.inl
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index 56177403b3a..e76db19c6ce 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -15,7 +15,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Stream.i"
+#include "ace/Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Stream, "$Id$")
diff --git a/ace/Stream.h b/ace/Stream.h
index c96d6222afd..c5fe5787e21 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -217,7 +217,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Stream.i"
+#include "ace/Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Stream.i b/ace/Stream.inl
index 42a4989eff0..42a4989eff0 100644
--- a/ace/Stream.i
+++ b/ace/Stream.inl
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp
index 4da945be530..51e71589a22 100644
--- a/ace/String_Base.cpp
+++ b/ace/String_Base.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/String_Base.i"
+#include "ace/String_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/String_Base.h b/ace/String_Base.h
index a134c11f80a..d2598424fc4 100644
--- a/ace/String_Base.h
+++ b/ace/String_Base.h
@@ -427,7 +427,7 @@ template < class CHAR > ACE_INLINE
                                        const ACE_String_Base < CHAR > &t);
 
 #if defined (__ACE_INLINE__)
-#include "ace/String_Base.i"
+#include "ace/String_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/String_Base.i b/ace/String_Base.inl
index e54080f70b6..e54080f70b6 100644
--- a/ace/String_Base.i
+++ b/ace/String_Base.inl
diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp
index 12f628c57f7..780c664099f 100644
--- a/ace/Synch_Options.cpp
+++ b/ace/Synch_Options.cpp
@@ -1,7 +1,7 @@
 #include "ace/Synch_Options.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Synch_Options.i"
+#include "ace/Synch_Options.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Global_Macros.h"
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index 8cc0a4d3186..aba1ec85b08 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -150,7 +150,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Synch_Options.i"
+#include "ace/Synch_Options.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Synch_Options.i b/ace/Synch_Options.inl
index 3cba94e0fef..3cba94e0fef 100644
--- a/ace/Synch_Options.i
+++ b/ace/Synch_Options.inl
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 9e60c947e0d..22c747bade0 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -16,7 +16,7 @@ ACE_RCSID(ace, TLI, "$Id$")
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/TLI.i"
+#include "ace/TLI.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI)
diff --git a/ace/TLI.h b/ace/TLI.h
index b0f1c181f4b..bc0997ca7ff 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -102,7 +102,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/TLI.i"
+#include "ace/TLI.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI.i b/ace/TLI.inl
index 8f32186deaf..8f32186deaf 100644
--- a/ace/TLI.i
+++ b/ace/TLI.inl
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 07be064d858..1a717f338b6 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(ace, TLI_Connector, "$Id$")
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/TLI_Connector.i"
+#include "ace/TLI_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Handle_Set.h"
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index e383f40c034..f625458f204 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -118,7 +118,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/TLI_Connector.i"
+#include "ace/TLI_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.inl
index 6539e19a6cd..6539e19a6cd 100644
--- a/ace/TLI_Connector.i
+++ b/ace/TLI_Connector.inl
diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp
index 0b4aefff632..cf42719db85 100644
--- a/ace/TLI_Stream.cpp
+++ b/ace/TLI_Stream.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(ace, TLI_Stream, "$Id$")
 #if defined (ACE_HAS_TLI)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/TLI_Stream.i"
+#include "ace/TLI_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream)
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 4a1ce7fcde0..c4036b2bb13 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -127,7 +127,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/TLI_Stream.i"
+#include "ace/TLI_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI_Stream.i b/ace/TLI_Stream.inl
index 89583e7fb8b..89583e7fb8b 100644
--- a/ace/TLI_Stream.i
+++ b/ace/TLI_Stream.inl
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 57d0f848b79..0a8daf74dd7 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_sys_time.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/TP_Reactor.i"
+#include "ace/TP_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index 30c7956ebd5..5833e809652 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -346,7 +346,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/TP_Reactor.i"
+#include "ace/TP_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/TP_Reactor.i b/ace/TP_Reactor.inl
index a3a9de3d1de..a3a9de3d1de 100644
--- a/ace/TP_Reactor.i
+++ b/ace/TP_Reactor.inl
diff --git a/ace/Task.cpp b/ace/Task.cpp
index a774e724ba0..a5a51d0da93 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -4,7 +4,7 @@
 #include "ace/Module.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Task.i"
+#include "ace/Task.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Task, "$Id$")
diff --git a/ace/Task.h b/ace/Task.h
index 0d39f71ce8d..eea6e6f8f8e 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -278,7 +278,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Task.i"
+#include "ace/Task.inl"
 #endif /* __ACE_INLINE__ */
 
 // Include the ACE_Task templates classes at this point.
diff --git a/ace/Task.i b/ace/Task.inl
index fd9f992579b..fd9f992579b 100644
--- a/ace/Task.i
+++ b/ace/Task.inl
diff --git a/ace/Task_Ex_T.cpp b/ace/Task_Ex_T.cpp
index 24bd5345343..a265355c22e 100644
--- a/ace/Task_Ex_T.cpp
+++ b/ace/Task_Ex_T.cpp
@@ -14,7 +14,7 @@
 #include "ace/Null_Condition.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Task_Ex_T.i"
+#include "ace/Task_Ex_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Task_Ex_T, "$Id$")
@@ -83,7 +83,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::sibling (void)
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::sibling");
   /// @todo FIXME Need to impl ACE_Moudle to support ACE_Task as well.
   /// Now always return 0 for sibling
-  return 0;  
+  return 0;
 /*
   if (this->mod_ == 0)
     return 0;
diff --git a/ace/Task_Ex_T.h b/ace/Task_Ex_T.h
index 2539294af8f..9777a90ff03 100644
--- a/ace/Task_Ex_T.h
+++ b/ace/Task_Ex_T.h
@@ -183,7 +183,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Task_Ex_T.i"
+#include "ace/Task_Ex_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Task_Ex_T.i b/ace/Task_Ex_T.inl
index fb68b7f874e..fb68b7f874e 100644
--- a/ace/Task_Ex_T.i
+++ b/ace/Task_Ex_T.inl
diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp
index a75ec7d9f61..e35297792cb 100644
--- a/ace/Task_T.cpp
+++ b/ace/Task_T.cpp
@@ -14,7 +14,7 @@
 #include "ace/Null_Condition.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Task_T.i"
+#include "ace/Task_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Task_T, "$Id$")
diff --git a/ace/Task_T.h b/ace/Task_T.h
index ff8d6df04fa..52c0f6b2218 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -168,7 +168,7 @@ template class ACE_Export ACE_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Task_T.i"
+#include "ace/Task_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Task_T.i b/ace/Task_T.inl
index e4694062fc4..e4694062fc4 100644
--- a/ace/Task_T.i
+++ b/ace/Task_T.inl
diff --git a/ace/Thread.cpp b/ace/Thread.cpp
index 426e9535955..80ce71f3d7e 100644
--- a/ace/Thread.cpp
+++ b/ace/Thread.cpp
@@ -4,7 +4,7 @@
 #include "ace/Thread.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Thread.i"
+#include "ace/Thread.inl"
 #endif /* !defined (__ACE_INLINE__) */
 
 ACE_RCSID(ace,
diff --git a/ace/Thread.h b/ace/Thread.h
index fcfe867ff99..a794b9d272b 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -250,7 +250,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Thread.i"
+#include "ace/Thread.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Thread.i b/ace/Thread.inl
index f12145ff040..f12145ff040 100644
--- a/ace/Thread.i
+++ b/ace/Thread.inl
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 78b4aa77c29..bd1318a5e93 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -9,7 +9,7 @@
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Thread_Manager.i"
+#include "ace/Thread_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Thread_Manager, "$Id$")
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 87e849bfc61..51d09cdadca 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -1100,7 +1100,7 @@ typedef ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX> ACE_THREAD_MANAGER_SI
 #endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Thread_Manager.i"
+#include "ace/Thread_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Thread_Manager.i b/ace/Thread_Manager.inl
index 8c2c7243a5f..8c2c7243a5f 100644
--- a/ace/Thread_Manager.i
+++ b/ace/Thread_Manager.inl
diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp
index 1738da19618..691d4cdb9b8 100644
--- a/ace/Timeprobe.cpp
+++ b/ace/Timeprobe.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(ace, Timeprobe, "$Id$")
 #include "ace/Timeprobe.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Timeprobe.i"
+#include "ace/Timeprobe.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index ff9a12144ec..359397b7520 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -112,7 +112,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Timeprobe.i"
+#include "ace/Timeprobe.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Synch_Traits.h"
diff --git a/ace/Timeprobe.i b/ace/Timeprobe.inl
index 2815dd56e0c..2815dd56e0c 100644
--- a/ace/Timeprobe.i
+++ b/ace/Timeprobe.inl
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 98078030f5a..6bd7caf2066 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(ace, Timer_Queue_Adapters, "$Id$")
 
 # if !defined (__ACE_INLINE__)
-#  include "ace/Timer_Queue_Adapters.i"
+#  include "ace/Timer_Queue_Adapters.inl"
 # endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_unistd.h"
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index 1caead77c9d..6543803339b 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -230,7 +230,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Timer_Queue_Adapters.i"
+# include "ace/Timer_Queue_Adapters.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.inl
index e2aa5c562cf..e2aa5c562cf 100644
--- a/ace/Timer_Queue_Adapters.i
+++ b/ace/Timer_Queue_Adapters.inl
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index 743b942540e..4c125cfabcd 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -17,7 +17,7 @@
 #include "ace/OS_NS_sys_time.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Timer_Queue_T.i"
+#include "ace/Timer_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 5f103313135..50ed8ce99a8 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -543,7 +543,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Timer_Queue_T.i"
+#include "ace/Timer_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
diff --git a/ace/Timer_Queue_T.i b/ace/Timer_Queue_T.inl
index a4af07d5372..a4af07d5372 100644
--- a/ace/Timer_Queue_T.i
+++ b/ace/Timer_Queue_T.inl
diff --git a/ace/Token.cpp b/ace/Token.cpp
index 4db5a8de7a8..d67e51e5bcb 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(ace, Token, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token.i"
+#include "ace/Token.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_THREADS)
diff --git a/ace/Token.h b/ace/Token.h
index ef2ffb21acd..cb2f7409835 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -352,7 +352,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token.i"
+#include "ace/Token.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/Token.i b/ace/Token.inl
index 5cea9866cea..5cea9866cea 100644
--- a/ace/Token.i
+++ b/ace/Token.inl
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index 4335b93ffd3..c85c7f7e08f 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -1,7 +1,7 @@
 #include "ace/Token_Collection.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Collection.i"
+#include "ace/Token_Collection.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 3ae8f292a67..c7ad7076100 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -233,7 +233,7 @@ protected:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Collection.i"
+#include "ace/Token_Collection.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Token_Collection.i b/ace/Token_Collection.inl
index fcab4df9b09..fcab4df9b09 100644
--- a/ace/Token_Collection.i
+++ b/ace/Token_Collection.inl
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index b5be9397ea4..24d79871448 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -2,7 +2,7 @@
 #include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Manager.i"
+#include "ace/Token_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index e9eb8055bde..50accedf0c0 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -139,7 +139,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Manager.i"
+#include "ace/Token_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Token_Manager.i b/ace/Token_Manager.inl
index 2ef2d7e1f53..2ef2d7e1f53 100644
--- a/ace/Token_Manager.i
+++ b/ace/Token_Manager.inl
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index 7ff4f595f10..01ee4fb305d 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -3,7 +3,7 @@
 #include "ace/Token_Request_Reply.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Token_Request_Reply.i"
+#include "ace/Token_Request_Reply.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
@@ -70,7 +70,7 @@ ACE_Token_Request::decode (void)
       return -1;
     }
   else // Skip this->tokenName_ + '\0' + ':'.
-    this->client_id_ = 
+    this->client_id_ =
       &this->token_name_[(token_len + 2) * sizeof (ACE_TCHAR)];
 
   // Fixed size header
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index b6903aaa552..50c41810e88 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -257,7 +257,7 @@ private:
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
-#include "ace/Token_Request_Reply.i"
+#include "ace/Token_Request_Reply.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.inl
index e1c8ace3ad5..e1c8ace3ad5 100644
--- a/ace/Token_Request_Reply.i
+++ b/ace/Token_Request_Reply.inl
diff --git a/ace/Typed_SV_Message.cpp b/ace/Typed_SV_Message.cpp
index ec75a1e4a5d..3062952d2b4 100644
--- a/ace/Typed_SV_Message.cpp
+++ b/ace/Typed_SV_Message.cpp
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message.i"
+#include "ace/Typed_SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Typed_SV_Message, "$Id$")
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index 8c3598f3e90..178cdfb8340 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -87,7 +87,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message.i"
+#include "ace/Typed_SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Typed_SV_Message.i b/ace/Typed_SV_Message.inl
index 27949626500..27949626500 100644
--- a/ace/Typed_SV_Message.i
+++ b/ace/Typed_SV_Message.inl
diff --git a/ace/Typed_SV_Message_Queue.cpp b/ace/Typed_SV_Message_Queue.cpp
index 7277df343b4..c1d6bb6de39 100644
--- a/ace/Typed_SV_Message_Queue.cpp
+++ b/ace/Typed_SV_Message_Queue.cpp
@@ -14,7 +14,7 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message_Queue.i"
+#include "ace/Typed_SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Typed_SV_Message_Queue, "$Id$")
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index 9763e47c5ac..6c486197450 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -73,7 +73,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Typed_SV_Message_Queue.i"
+#include "ace/Typed_SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Typed_SV_Message_Queue.i b/ace/Typed_SV_Message_Queue.inl
index aad60fd2055..aad60fd2055 100644
--- a/ace/Typed_SV_Message_Queue.i
+++ b/ace/Typed_SV_Message_Queue.inl
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 3ca05e46eb7..4ef4c22a1c9 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -8,20 +8,20 @@ ACE_RCSID(ace, UNIX_Addr, "$Id$")
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/UNIX_Addr.i"
+#include "ace/UNIX_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr)
 
 // Set a pointer to the address.
-void 
+void
 ACE_UNIX_Addr::set_addr (void *addr, int len)
 {
   ACE_TRACE ("ACE_UNIX_Addr::set_addr");
 
   this->ACE_Addr::base_set (AF_UNIX, len);
   ACE_OS::memcpy ((void *) &this->unix_addr_,
-		  (void *) addr, 
+		  (void *) addr,
 		  len);
 }
 
@@ -32,7 +32,7 @@ ACE_UNIX_Addr::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-// Do nothing constructor. 
+// Do nothing constructor.
 
 ACE_UNIX_Addr::ACE_UNIX_Addr (void)
   : ACE_Addr (AF_UNIX, sizeof this->unix_addr_)
@@ -61,7 +61,7 @@ ACE_UNIX_Addr::set (const ACE_UNIX_Addr &sa)
   return 0;
 }
 
-// Copy constructor. 
+// Copy constructor.
 
 ACE_UNIX_Addr::ACE_UNIX_Addr (const ACE_UNIX_Addr &sa)
   : ACE_Addr (AF_UNIX, sa.get_size ())
@@ -72,7 +72,7 @@ ACE_UNIX_Addr::ACE_UNIX_Addr (const ACE_UNIX_Addr &sa)
 int
 ACE_UNIX_Addr::set (const sockaddr_un *un, int len)
 {
-  (void) ACE_OS::memset ((void *) &this->unix_addr_, 0, 
+  (void) ACE_OS::memset ((void *) &this->unix_addr_, 0,
 		   sizeof this->unix_addr_);
   this->unix_addr_.sun_family = AF_UNIX;
   ACE_OS::strcpy (this->unix_addr_.sun_path, un->sun_path);
@@ -88,18 +88,18 @@ ACE_UNIX_Addr::ACE_UNIX_Addr (const sockaddr_un *un, int len)
 int
 ACE_UNIX_Addr::set (const char rendezvous_point[])
 {
-  (void) ACE_OS::memset ((void *) &this->unix_addr_, 
+  (void) ACE_OS::memset ((void *) &this->unix_addr_,
 			 0,
 			 sizeof this->unix_addr_);
   this->unix_addr_.sun_family = AF_UNIX;
   size_t len = ACE_OS::strlen (rendezvous_point);
   size_t maxlen = sizeof this->unix_addr_.sun_path;
- 
-  (void) ACE_OS::memcpy (this->unix_addr_.sun_path, 
+
+  (void) ACE_OS::memcpy (this->unix_addr_.sun_path,
 			 rendezvous_point,
                          len >= maxlen ? maxlen - 1 : len);
- 
-  this->ACE_Addr::base_set (AF_UNIX, 
+
+  this->ACE_Addr::base_set (AF_UNIX,
 			    sizeof this->unix_addr_ -
 			    sizeof (this->unix_addr_.sun_path) +
 			    ACE_OS::strlen (this->unix_addr_.sun_path));
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index df31faa137e..86be58e2452 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -94,7 +94,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/UNIX_Addr.i"
+#include "ace/UNIX_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/UNIX_Addr.i b/ace/UNIX_Addr.inl
index 57303a817da..57303a817da 100644
--- a/ace/UNIX_Addr.i
+++ b/ace/UNIX_Addr.inl
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp
index 56d26c4dc1d..c7fa930f284 100644
--- a/ace/UPIPE_Acceptor.cpp
+++ b/ace/UPIPE_Acceptor.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(ace, UPIPE_Acceptor, "$Id$")
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/UPIPE_Acceptor.i"
+#include "ace/UPIPE_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor)
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index 17d17f80bfb..0f51b3253bb 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -85,7 +85,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/UPIPE_Acceptor.i"
+#include "ace/UPIPE_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Acceptor.i b/ace/UPIPE_Acceptor.inl
index 0e28e250ab0..0e28e250ab0 100644
--- a/ace/UPIPE_Acceptor.i
+++ b/ace/UPIPE_Acceptor.inl
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index 5d4953aac76..9702f1da622 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(ace, UPIPE_Connector, "$Id$")
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/UPIPE_Connector.i"
+#include "ace/UPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector)
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 6a7378001fd..b98ab643c92 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -103,7 +103,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/UPIPE_Connector.i"
+#include "ace/UPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.inl
index 980d8a28164..980d8a28164 100644
--- a/ace/UPIPE_Connector.i
+++ b/ace/UPIPE_Connector.inl
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index c7bdc606ab4..e452db9f56e 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -8,8 +8,8 @@ ACE_RCSID(ace, UPIPE_Stream, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
-#if !defined (__ACE_INLINE__) 
-#include "ace/UPIPE_Stream.i"
+#if !defined (__ACE_INLINE__)
+#include "ace/UPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -37,7 +37,7 @@ ACE_UPIPE_Stream::control (int cmd,
 {
   ACE_TRACE ("ACE_UPIPE_Stream::control");
 
-  return ((ACE_UPIPE_Stream *) this)->stream_.control 
+  return ((ACE_UPIPE_Stream *) this)->stream_.control
     ((ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds) cmd, val);
 }
 
@@ -49,7 +49,7 @@ ACE_UPIPE_Stream::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-int 
+int
 ACE_UPIPE_Stream::close (void)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::close");
@@ -71,7 +71,7 @@ ACE_UPIPE_Stream::close (void)
   return 0;
 }
 
-int 
+int
 ACE_UPIPE_Stream::get_remote_addr (ACE_UPIPE_Addr &remote_sap) const
 {
   ACE_TRACE ("ACE_UPIPE_Stream::get_remote_addr");
@@ -80,14 +80,14 @@ ACE_UPIPE_Stream::get_remote_addr (ACE_UPIPE_Addr &remote_sap) const
 }
 
 int
-ACE_UPIPE_Stream::send (ACE_Message_Block *mb_p, 
+ACE_UPIPE_Stream::send (ACE_Message_Block *mb_p,
                         ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::send_msg");
   return this->stream_.put (mb_p, timeout) == -1 ? -1 : 0;
 }
 
-int ACE_UPIPE_Stream::recv (ACE_Message_Block *& mb_p, 
+int ACE_UPIPE_Stream::recv (ACE_Message_Block *& mb_p,
                             ACE_Time_Value *timeout)
 {
   return this->stream_.get (mb_p, timeout) == -1 ? -1 : 0;
@@ -96,8 +96,8 @@ int ACE_UPIPE_Stream::recv (ACE_Message_Block *& mb_p,
 // Send a buffer.
 
 ssize_t
-ACE_UPIPE_Stream::send (const char *buffer, 
-                        size_t n, 
+ACE_UPIPE_Stream::send (const char *buffer,
+                        size_t n,
                         ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::send");
@@ -116,13 +116,13 @@ ACE_UPIPE_Stream::send (const char *buffer,
 // Receive a buffer.
 
 ssize_t
-ACE_UPIPE_Stream::recv (char *buffer, 
+ACE_UPIPE_Stream::recv (char *buffer,
                         size_t n,
                         ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::recv");
   // Index in buffer.
-  size_t bytes_read = 0;   
+  size_t bytes_read = 0;
 
   while (bytes_read < n)
     if (this->mb_last_ != 0)
@@ -133,8 +133,8 @@ ACE_UPIPE_Stream::recv (char *buffer,
           {
             // The remaining data is not enough.
 
-            ACE_OS::memcpy ((void *) &buffer[bytes_read], 
-                            this->mb_last_->rd_ptr (), 
+            ACE_OS::memcpy ((void *) &buffer[bytes_read],
+                            this->mb_last_->rd_ptr (),
                             this_len);
             bytes_read += this_len;
             this->mb_last_ = this->mb_last_->release ();   // mb_last_ now 0
@@ -144,8 +144,8 @@ ACE_UPIPE_Stream::recv (char *buffer,
           {
             // The remaining data is at least enough.  If there's
             // more, we'll get it the next time through.
-            ACE_OS::memcpy (&buffer[bytes_read], 
-                            this->mb_last_->rd_ptr (), 
+            ACE_OS::memcpy (&buffer[bytes_read],
+                            this->mb_last_->rd_ptr (),
                             n);
             bytes_read += n;
 
@@ -166,7 +166,7 @@ ACE_UPIPE_Stream::recv (char *buffer,
           {
             if (errno == EWOULDBLOCK && bytes_read > 0)
               // Return the number of bytes read before we timed out.
-              return bytes_read; 
+              return bytes_read;
             else
               return -1;
           }
@@ -176,7 +176,7 @@ ACE_UPIPE_Stream::recv (char *buffer,
 }
 
 ssize_t
-ACE_UPIPE_Stream::send_n (const char *buf, 
+ACE_UPIPE_Stream::send_n (const char *buf,
                           size_t n,
                           ACE_Time_Value *timeout)
 {
@@ -185,12 +185,12 @@ ACE_UPIPE_Stream::send_n (const char *buf,
   size_t bytes_written;
   ssize_t len = 0;
 
-  for (bytes_written = 0; 
+  for (bytes_written = 0;
        bytes_written < n;
        bytes_written += len)
     {
       len = this->send (buf + bytes_written,
-                        n - bytes_written, 
+                        n - bytes_written,
                         timeout);
 
       if (len == -1)
@@ -201,19 +201,19 @@ ACE_UPIPE_Stream::send_n (const char *buf,
 }
 
 ssize_t
-ACE_UPIPE_Stream::recv_n (char *buf, 
-                          size_t n, 
+ACE_UPIPE_Stream::recv_n (char *buf,
+                          size_t n,
                           ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::recv_n");
   size_t bytes_read;
   ssize_t len = 0;
 
-  for (bytes_read = 0; 
+  for (bytes_read = 0;
        bytes_read < n;
        bytes_read += len)
     {
-      len = this->recv (buf + bytes_read, 
+      len = this->recv (buf + bytes_read,
                         n - bytes_read,
                         timeout);
       if (len == -1)
@@ -222,7 +222,7 @@ ACE_UPIPE_Stream::recv_n (char *buf,
         break;
     }
 
-  return bytes_read;      
+  return bytes_read;
 }
 
 
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index 646efe3df90..a31e1858005 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -128,7 +128,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/UPIPE_Stream.i"
+#include "ace/UPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Stream.i b/ace/UPIPE_Stream.inl
index 9bd3912d1ba..9bd3912d1ba 100644
--- a/ace/UPIPE_Stream.i
+++ b/ace/UPIPE_Stream.inl
diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp
index 1101fe04139..2dcbd96f67c 100644
--- a/ace/Vector_T.cpp
+++ b/ace/Vector_T.cpp
@@ -10,7 +10,7 @@
 #include "ace/Vector_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Vector_T.i"
+#include "ace/Vector_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Vector_T, "$Id$")
diff --git a/ace/Vector_T.h b/ace/Vector_T.h
index 9b56c679aac..c6e5b60b074 100644
--- a/ace/Vector_T.h
+++ b/ace/Vector_T.h
@@ -294,7 +294,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Vector_T.i"
+#include "ace/Vector_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Vector_T.i b/ace/Vector_T.inl
index a936c2bfe4d..a936c2bfe4d 100644
--- a/ace/Vector_T.i
+++ b/ace/Vector_T.inl
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 7c13983afdc..060f3cd1b49 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -11,7 +11,7 @@
 #include "ace/Null_Condition.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/WFMO_Reactor.i"
+#include "ace/WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, WFMO_Reactor, "$Id$")
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index dd3ec03f1cb..7be1525ea8a 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -1343,7 +1343,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/WFMO_Reactor.i"
+#include "ace/WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_WIN32 */
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.inl
index 0521b1803a8..0521b1803a8 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.inl
diff --git a/ace/XTI_ATM_Mcast.cpp b/ace/XTI_ATM_Mcast.cpp
index 334167dbcf3..a4524e248f9 100644
--- a/ace/XTI_ATM_Mcast.cpp
+++ b/ace/XTI_ATM_Mcast.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(ace, XTI_ATM_Mcast, "$Id$")
 #if defined (ACE_HAS_XTI_ATM)
 
 #if !defined (__ACE_INLINE__)
-#include "ace/XTI_ATM_Mcast.i"
+#include "ace/XTI_ATM_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast)
@@ -29,7 +29,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void)
 // Add a leaf to the current connection (i.e., multicast).
 
 int
-ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream &current_stream, 
+ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream &current_stream,
 			     const ACE_Addr &remote_sap,
 			     ACE_INT32 leaf_id,
                              ACE_Time_Value *timeout)
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index 175a1e2e2c7..ea2ba46739f 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -123,7 +123,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/XTI_ATM_Mcast.i"
+#include "ace/XTI_ATM_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_XTI_ATM */
diff --git a/ace/XTI_ATM_Mcast.i b/ace/XTI_ATM_Mcast.inl
index 895f37f30ff..895f37f30ff 100644
--- a/ace/XTI_ATM_Mcast.i
+++ b/ace/XTI_ATM_Mcast.inl
diff --git a/ace/ace.mpc b/ace/ace.mpc
index b21bbe62ac4..b010fc6ca43 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -381,9 +381,9 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
   }
 
   Inline_Files {
-    Bound_Ptr.i
-    Handle_Gobbler.i
-    Refcounted_Auto_Ptr.i
+    Bound_Ptr.inl
+    Handle_Gobbler.inl
+    Refcounted_Auto_Ptr.inl
     ace_wchar.inl
   }