Updated dependencies.

11 files changed, 310 insertions, 120 deletions

diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile
index 0d1ccb9d845..2414f455afc 100644
--- a/TAO/tao/BiDir_GIOP/Makefile
+++ b/TAO/tao/BiDir_GIOP/Makefile
@@ -348,6 +348,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1648,6 +1650,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile
index d6bf3a47cad..b14fa5d971e 100644
--- a/TAO/tao/DynamicInterface/Makefile
+++ b/TAO/tao/DynamicInterface/Makefile
@@ -821,6 +821,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2431,6 +2433,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
diff --git a/TAO/tao/IORInterceptor/Makefile b/TAO/tao/IORInterceptor/Makefile
index e2cf55c03dd..60ddce66f18 100644
--- a/TAO/tao/IORInterceptor/Makefile
+++ b/TAO/tao/IORInterceptor/Makefile
@@ -681,6 +681,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/PICurrent.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
@@ -1379,6 +1381,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/PICurrent.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index e3f1536a6b4..aabdab39108 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -855,9 +855,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -917,8 +920,6 @@ realclean:
   CONV_FRAMEC.h \
   Tagged_Components.i \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i Environment.h Thread_Lane_Resources.h \
   Thread_Lane_Resources.i \
@@ -1170,9 +1171,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -1691,9 +1695,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -2400,6 +2407,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2455,8 +2464,6 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i \
   Transport_Connector.h \
@@ -2703,9 +2710,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -4027,6 +4037,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -4452,6 +4464,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -5197,6 +5211,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -5220,8 +5236,6 @@ realclean:
   Tagged_Components.h \
   Tagged_Components.i \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
@@ -6054,6 +6068,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -6091,8 +6107,6 @@ realclean:
   Tagged_Components.h \
   Tagged_Components.i \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
@@ -6469,6 +6483,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -7506,6 +7522,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8226,6 +8244,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8677,6 +8697,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -9037,6 +9059,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10217,6 +10241,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11298,9 +11324,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -11349,8 +11378,6 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i default_ports.h ORBInitInfo.h ORBInitInfo.inl \
   ORBInitializer_Registry.h TAO_Singleton_Manager.h \
@@ -11961,6 +11988,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12614,6 +12643,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12964,6 +12995,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14498,6 +14531,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14911,6 +14946,7 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -17033,8 +17069,10 @@ realclean:
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
   ObjectKey_Table.h $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -17080,8 +17118,6 @@ realclean:
   CONV_FRAMEC.h \
   Tagged_Components.i \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i Tagged_Components.h Valuetype_Adapter.h debug.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -17522,7 +17558,9 @@ realclean:
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
   ObjectKey_Table.h $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp PICurrent.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i PICurrent.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -18207,8 +18245,10 @@ realclean:
   Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -18254,8 +18294,6 @@ realclean:
   TAO_Server_Request.h Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Tagged_Profile.i \
   Service_Context.h \
   Service_Context.inl \
@@ -18493,8 +18531,10 @@ realclean:
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
   ObjectKey_Table.h $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -19042,9 +19082,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -19902,9 +19945,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -19979,8 +20025,6 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Refcounted_ObjectKey.inl \
   Profile.i Stub.h MProfile.h \
   ORB.h \
@@ -20349,9 +20393,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -21058,9 +21105,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -21407,6 +21457,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -21726,6 +21778,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22046,6 +22100,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22365,6 +22421,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22722,6 +22780,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23064,6 +23124,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23448,6 +23510,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24404,9 +24468,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -25733,6 +25800,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -26061,6 +26130,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -26614,9 +26685,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -27071,6 +27145,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -27552,6 +27628,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -30876,6 +30954,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -31768,9 +31848,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -32357,9 +32440,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -32722,6 +32808,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -33576,8 +33664,10 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h PICurrent.inl \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -34613,6 +34703,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -36226,9 +36318,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -36723,9 +36818,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -37018,9 +37116,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -38369,6 +38470,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -38734,6 +38837,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -39085,6 +39190,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -39893,13 +40000,31 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   TAO_Export.h \
-  $(ACE_ROOT)/ace/Null_Mutex.h ORB_Core.h \
-  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+  Object_KeyC.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   orbconf.h \
   $(ACE_ROOT)/ace/Synch_Traits.h \
   corbafwd.i \
-  Resource_Factory.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Sequence_T.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  Sequence.i \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Object_KeyC.i \
+  $(ACE_ROOT)/ace/Null_Mutex.h ORB_Core.h \
+  corbafwd.h Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -39921,9 +40046,6 @@ realclean:
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp CONV_FRAMEC.h \
   CDR.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -39932,13 +40054,6 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp CONV_FRAMEC.i \
@@ -39951,13 +40066,8 @@ realclean:
   Exception.h \
   Exception.i Adapter.i \
   PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
-  OctetSeqC.h Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp OctetSeqC.i \
-  StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i Object.h \
+  OctetSeqC.h OctetSeqC.i StringSeqC.h Sequence.h StringSeqC.i \
+  PI_ForwardC.i Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
   varbase.h \
@@ -40055,10 +40165,7 @@ realclean:
   $(ACE_ROOT)/ace/Lock_Adapter_T.h \
   $(ACE_ROOT)/ace/Lock_Adapter_T.inl \
   $(ACE_ROOT)/ace/Lock_Adapter_T.cpp ORB_Core.i \
-  Refcounted_ObjectKey.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Refcounted_ObjectKey.inl Object_KeyC.h
+  Refcounted_ObjectKey.h Refcounted_ObjectKey.inl
 
 .obj/Refcounted_ObjectKey.o .obj/Refcounted_ObjectKey.so .shobj/Refcounted_ObjectKey.o .shobj/Refcounted_ObjectKey.so: Refcounted_ObjectKey.cpp Refcounted_ObjectKey.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -40634,6 +40741,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -41090,6 +41199,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -41879,6 +41990,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -42274,6 +42387,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -42581,9 +42696,12 @@ realclean:
   Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
-  $(ACE_ROOT)/ace/RB_Tree.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h LocalObject.i \
-  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  LocalObject.i PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
@@ -42643,8 +42761,6 @@ realclean:
   TAO_Server_Request.h Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Tagged_Profile.i \
   TAO_Server_Request.i GIOP_Message_Locate_Header.h \
   Tagged_Profile.h \
@@ -42934,6 +43050,8 @@ realclean:
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -42993,8 +43111,6 @@ realclean:
   Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Tagged_Profile.i \
   TAO_Server_Request.i \
   GIOP_Message_Locate_Header.h \
diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile
index 148e1ebc294..00bf187e82e 100644
--- a/TAO/tao/Messaging/Makefile
+++ b/TAO/tao/Messaging/Makefile
@@ -747,6 +747,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1346,6 +1348,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2030,6 +2034,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3676,6 +3682,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4341,6 +4349,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index ea690010227..91e54352395 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -4238,6 +4238,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4598,6 +4600,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4658,8 +4662,6 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i
 
@@ -7596,6 +7598,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8118,6 +8122,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -10328,6 +10334,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -11848,6 +11856,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index 4e00582af68..0aac74dfce6 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -980,6 +980,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3365,6 +3367,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4889,6 +4893,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -5296,6 +5302,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -6100,6 +6108,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -6486,6 +6496,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -6838,6 +6850,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -7454,6 +7468,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index 2bf6946701b..043d871c30a 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -1076,6 +1076,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1226,8 +1228,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/PortableServer/POA.i \
   $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -1585,6 +1585,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2458,6 +2460,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/RTScheduling/Makefile b/TAO/tao/RTScheduling/Makefile
index a332dc4ccd9..9ac3112ebf1 100644
--- a/TAO/tao/RTScheduling/Makefile
+++ b/TAO/tao/RTScheduling/Makefile
@@ -966,6 +966,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 2f20549a66b..22fce724a7e 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -537,6 +537,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1349,6 +1351,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1367,8 +1371,6 @@ endif
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
@@ -1860,6 +1862,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1890,8 +1894,6 @@ endif
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   DIOP_Endpoint.i DIOP_Profile.i
@@ -2327,6 +2329,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2345,8 +2349,6 @@ endif
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
@@ -2787,6 +2789,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3607,6 +3611,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4073,6 +4079,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -5983,6 +5991,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -6000,8 +6010,6 @@ endif
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i UIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
@@ -6447,6 +6455,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8494,6 +8504,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -10355,6 +10367,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -10387,8 +10401,6 @@ endif
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i SHMIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
@@ -10849,6 +10861,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -11798,6 +11812,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/Valuetype/Makefile b/TAO/tao/Valuetype/Makefile
index 4279102ad5f..885d45a08dc 100644
--- a/TAO/tao/Valuetype/Makefile
+++ b/TAO/tao/Valuetype/Makefile
@@ -380,6 +380,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -754,6 +756,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1100,6 +1104,8 @@ endif
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1139,8 +1145,6 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/debug.h