ChangeLogTag:Tue Aug 23 10:43:07 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

24 files changed, 80 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c970af489de..df264c9dc66 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,35 @@
+Tue Aug 23 10:43:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+	* tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+	* tao/IORManipulation/IORA.cpp:
+	* tao/ImR_Client/ImplRepoA.cpp:
+	* tao/ImR_Client/ImplRepoS.cpp:
+	* tao/ImR_Client/ServerObjectA.cpp:
+	* tao/ImR_Client/ServerObjectS.cpp:
+	* tao/ObjRefTemplate/Default_ORTA.cpp:
+	* tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp:
+	* tao/RTCORBA/RTCORBAA.cpp:
+	* tao/RTCORBA/RT_ORBInitializer.h:
+	* tao/RTCORBA/rtcorba_export.h:
+	* tao/RTCORBA/rtcorba_typedefs.h:
+	* tao/RTPortableServer/RTPortableServerA.cpp:
+	* tao/RTScheduling/RTSchedulerC.h:
+	* tao/Strategies/sciop_endpointsC.cpp:
+	* tao/Strategies/uiop_endpointsC.cpp:
+	* tao/TypeCodeFactory/TypeCodeFactoryA.cpp:
+	* tao/TypeCodeFactory/TypeCodeFactoryC.h:
+	* tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
+	* tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+	* tao/Utils/RIR_Narrow.h:
+
+	  Reordered include directives to make sure all necessary
+	  non-dependent names are parsed before the templates that use
+	  them.  In the case of the "*A.h" files, this is a temporary
+	  work-around until TAO_IDL is updated.  Addresses g++ 3.4.x or
+	  better compile-time errors.
+
 Tue Aug 23 14:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Strategies/SHMIOP_Acceptor.cpp:
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 986cc031d01..8dfe90401cf 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "IORInterceptor_Adapter_Factory_Impl.h"
 #include "IORInterceptor_Adapter_Impl.h"
+#include "IORInterceptor_Adapter_Factory_Impl.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index d14a32295cf..f41d267a92f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -21,8 +21,9 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Service_Config.h"
+
 #include "tao/IORInterceptor_Adapter_Factory.h"
+#include "ace/Service_Config.h"
 
 
 class TAO_IORInterceptor_Adapter;
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index f1336733eb8..52c1cd47f32 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -22,9 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor_Adapter.h"
-#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PI/Interceptor_List_T.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
+#include "tao/IORInterceptor_Adapter.h"
 
 namespace TAO
 {
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 164f0dc60b9..8f9b028afe9 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IORManip_Loader.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -33,6 +32,7 @@
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "IORManip_Loader.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
index 6fd14f542ee..f1be0159fb9 100644
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoA.cpp
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ImplRepoC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +35,7 @@
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "ImplRepoC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 03796e3ca15..99f1aa0147b 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -33,6 +33,8 @@
 #define _TAO_IDL_IMPLREPOS_CPP_
 
 
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "ImplRepoS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
@@ -54,8 +56,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
diff --git a/TAO/tao/ImR_Client/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
index fcc9fb5f011..68257fa382a 100644
--- a/TAO/tao/ImR_Client/ServerObjectA.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectA.cpp
@@ -25,11 +25,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServerObjectC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "ServerObjectC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index ec7ca490865..9ef5dcc5bd4 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -33,6 +33,8 @@
 #define _TAO_IDL_SERVEROBJECTS_CPP_
 
 
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "ServerObjectS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
@@ -53,8 +55,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index b78d8423c3f..ccf1e5bb0fc 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -25,13 +25,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Default_ORTC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "Default_ORTC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index 3ee1ad6f6d7..a5fcc1c409e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectReferenceTemplate.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -33,6 +32,7 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "ObjectReferenceTemplate.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 024e8b87aac..586a636e497 100644
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RTCORBA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +35,7 @@
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 87e9a823e13..be73cbd49d0 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -26,6 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tao/RTCORBA/rtcorba_export.h b/TAO/tao/RTCORBA/rtcorba_export.h
index d6393088876..e712f3013ce 100644
--- a/TAO/tao/RTCORBA/rtcorba_export.h
+++ b/TAO/tao/RTCORBA/rtcorba_export.h
@@ -9,8 +9,6 @@
 
 #include "ace/config-all.h"
 
-#include "tao/Objref_VarOut_T.h"
-
 #if defined (TAO_AS_STATIC_LIBS)
 #  if !defined (TAO_RTCORBA_HAS_DLL)
 #    define TAO_RTCORBA_HAS_DLL 0
diff --git a/TAO/tao/RTCORBA/rtcorba_typedefs.h b/TAO/tao/RTCORBA/rtcorba_typedefs.h
index 844486f5a77..d39f5b27a2d 100644
--- a/TAO/tao/RTCORBA/rtcorba_typedefs.h
+++ b/TAO/tao/RTCORBA/rtcorba_typedefs.h
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+
+
 // Forward references.
 class TAO_Priority_Mapping_Manager;
 class TAO_Priority_Mapping_Manager_var;
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 7ebc2fb5586..d5d526ece27 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -25,12 +25,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RTPortableServer.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "RTPortableServer.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index 7465c8651a4..4955b9caf07 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -41,6 +41,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "rtscheduler_export.h"
+
+#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "tao/PI/ClientRequestInfoC.h"
+#include "tao/PI/PIForwardRequestC.h"
+
+#include "tao/RTCORBA/RTCORBA_includeC.h"
+
+#include "tao/PortableServer/PortableServer_includeC.h"
+
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -49,13 +58,7 @@
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
-
-#include "tao/RTCORBA/RTCORBA_includeC.h"
-#include "tao/PortableServer/PortableServer_includeC.h"
-#include "tao/PI/ClientRequestInfoC.h"
 #include "tao/PortableInterceptorC.h"
-#include "tao/PI/PIForwardRequestC.h"
-#include "tao/PI_Server/ServerRequestInfoC.h"
 
 #ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
 #error "You should not include RTSchedulerC.h directly, use RTScheduler.h"
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
index 1624ec7940a..21e65ac0c8a 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ b/TAO/tao/Strategies/sciop_endpointsC.cpp
@@ -29,8 +29,6 @@
 // be/be_codegen.cpp:291
 
 
-#include "sciop_endpointsC.h"
-#include "tao/CDR.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +36,8 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "sciop_endpointsC.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
index 293514fbdec..c3728f7bf79 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ b/TAO/tao/Strategies/uiop_endpointsC.cpp
@@ -29,8 +29,6 @@
 // be/be_codegen.cpp:291
 
 
-#include "uiop_endpointsC.h"
-#include "tao/CDR.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +36,8 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "uiop_endpointsC.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
index 0952ee4202b..555d87f9b75 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -25,12 +25,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TypeCodeFactoryC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "TypeCodeFactoryC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 1de9b8c30c0..a620aa9caec 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -41,12 +41,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "typecodefactory_export.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/IFR_Client/IFR_ExtendedC.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index a05ece0076a..3c041038f87 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "TypeCodeFactory_Adapter_Impl.h"
 #include "TypeCodeFactory_i.h"
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index dcbfab24c9e..22866614c38 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1,14 +1,10 @@
 // $Id$
 
-#include "TypeCodeFactory_i.h"
 #include "Recursive_TypeCode.h"
+#include "TypeCodeFactory_i.h"
 
-#include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/AnyTypeCode/Marshal.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
-#include "tao/SystemException.h"
 
 #include "tao/AnyTypeCode/Alias_TypeCode.h"
 #include "tao/AnyTypeCode/Enum_TypeCode.h"
@@ -28,6 +24,11 @@
 
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+#include "tao/ORB_Constants.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #include "ace/SString.h"
 #include "ace/Containers_T.h"
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index 1493567ebfe..24a7ad5c089 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -8,18 +8,20 @@
  * @author Carlos O'Ryan <coryan@atdesk.com>
  */
 //=============================================================================
+
 #ifndef TAO_UTILS_RIR_NARROW_H
 #define TAO_UTILS_RIR_NARROW_H
+
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/PI.h"
-
+#include "tao/ORB.h"
 
 namespace TAO
 {
@@ -63,4 +65,5 @@ namespace TAO
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
+
 #endif /*TAO_UTILS_RIR_NARROW_H*/