ChangeLog tag: Sat Jun 10 10:40:02 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>

5 files changed, 169 insertions, 169 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 63de7b016ad..a07871c28cc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jun 10 10:40:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/RTScheduling/Job_i.h:
+        * examples/RTScheduling/POA_Holder.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
+
+          More files where ace/Arg_Shifter.h needed to be directly
+          included.
+
 Sat Jun 10 05:03:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
@@ -7,164 +17,164 @@ Sat Jun 10 05:03:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 Sat Jun 10 04:34:32 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * docs/tutorials/Quoter/AMI/Makefile.am:
-	* docs/tutorials/Quoter/Event_Service/Makefile.am:
-	* docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
-	* docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-	* docs/tutorials/Quoter/idl/Makefile.am:
-	* examples/AMH/Sink_Server/Makefile.am:
-	* examples/AMI/FL_Callback/Makefile.am:
-	* examples/Advanced/ch_3/Makefile.am:
-	* examples/Buffered_AMI/Makefile.am:
-	* examples/Buffered_Oneways/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool2/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool3/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool4/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool5/Makefile.am:
-	* examples/CSD_Strategy/ThreadPool6/Makefile.am:
-	* examples/Callback_Quoter/Makefile.am:
-	* examples/Content_Server/AMI_Iterator/Makefile.am:
-	* examples/Content_Server/AMI_Observer/Makefile.am:
-	* examples/Content_Server/SMI_Iterator/Makefile.am:
-	* examples/Event_Comm/Makefile.am:
-	* examples/Kokyu_dsrt_schedulers/Makefile.am:
-	* examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
-	* examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
-	* examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
-	* examples/Load_Balancing/Makefile.am:
-	* examples/Load_Balancing_persistent/Makefile.am:
-	* examples/Logging/Makefile.am:
-	* examples/OBV/Typed_Events/Makefile.am:
-	* examples/POA/DSI/Makefile.am:
-	* examples/POA/Default_Servant/Makefile.am:
-	* examples/POA/Forwarding/Makefile.am:
-	* examples/POA/Generic_Servant/Makefile.am:
-	* examples/POA/TIE/Makefile.am:
-	* examples/Persistent_Grid/Makefile.am:
-	* examples/PluggableUDP/tests/Basic/Makefile.am:
-	* examples/PluggableUDP/tests/Performance/Makefile.am:
-	* examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-	* examples/Quoter/Makefile.am:
-	* examples/RTCORBA/Activity/Makefile.am:
-	* examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-	* examples/RTScheduling/MIF_Scheduler/Makefile.am:
-	* examples/Simple/bank/Makefile.am:
-	* examples/Simple/chat/Makefile.am:
-	* examples/Simple/echo/Makefile.am:
-	* examples/Simple/grid/Makefile.am:
-	* examples/Simple/time/Makefile.am:
-	* examples/Simple/time-date/Makefile.am:
-	* examples/Simulator/Event_Supplier/Makefile.am:
-	* examples/TypeCode_Creation/Makefile.am:
-	* examples/ior_corbaloc/Makefile.am:
-	* examples/mfc/Makefile.am:
-	* interop-tests/wchar/Makefile.am:
-	* orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-	* orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-	* orbsvcs/ImplRepo_Service/Makefile.am:
-	* orbsvcs/Naming_Service/Makefile.am:
-	* orbsvcs/Notify_Service/Makefile.am:
-	* orbsvcs/examples/CosEC/Factory/Makefile.am:
-	* orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-	* orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-	* orbsvcs/examples/ImR/Advanced/Makefile.am:
-	* orbsvcs/examples/ImR/Combined_Service/Makefile.am:
-	* orbsvcs/examples/LoadBalancing/Makefile.am:
-	* orbsvcs/examples/ORT/Makefile.am:
-	* orbsvcs/examples/Security/Send_File/Makefile.am:
-	* orbsvcs/orbsvcs/Makefile.am:
-	* orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-	* orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-	* orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-	* orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-	* orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
-	* orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-	* orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-	* orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-	* orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-	* orbsvcs/tests/Bug_2316_Regression/Makefile.am:
-	* orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-	* orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-	* orbsvcs/tests/FT_App/Makefile.am:
-	* orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-	* orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-	* orbsvcs/tests/FtRtEvent/Makefile.am:
-	* orbsvcs/tests/HTIOP/AMI/Makefile.am:
-	* orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
-	* orbsvcs/tests/HTIOP/Hello/Makefile.am:
-	* orbsvcs/tests/IOR_MCast/Makefile.am:
-	* orbsvcs/tests/ImplRepo/Makefile.am:
-	* orbsvcs/tests/ImplRepo/scale/Makefile.am:
-	* orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
-	* orbsvcs/tests/Interoperable_Naming/Makefile.am:
-	* orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
-	* orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
-	* orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-	* orbsvcs/tests/Miop/McastHello/Makefile.am:
-	* orbsvcs/tests/Notify/Blocking/Makefile.am:
-	* orbsvcs/tests/Notify/Discarding/Makefile.am:
-	* orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
-	* orbsvcs/tests/Notify/Ordering/Makefile.am:
-	* orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
-	* orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
-	* orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
-	* orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
-	* orbsvcs/tests/Notify/lib/Makefile.am:
-	* orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
-	* orbsvcs/tests/Redundant_Naming/Makefile.am:
-	* orbsvcs/tests/Security/BiDirectional/Makefile.am:
-	* orbsvcs/tests/Security/Big_Request/Makefile.am:
-	* orbsvcs/tests/Security/Callback/Makefile.am:
-	* orbsvcs/tests/Security/Crash_Test/Makefile.am:
-	* orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
-	* orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
-	* orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
-	* orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-	* orbsvcs/tests/Simple_Naming/Makefile.am:
-	* orbsvcs/tests/Trading/Makefile.am:
-	* orbsvcs/tests/ior_corbaname/Makefile.am:
-	* performance-tests/Makefile.am:
-	* performance-tests/Anyop/Makefile.am:
-	* performance-tests/CSD_Strategy/TestInf/Makefile.am:
-	* performance-tests/CSD_Strategy/TestServant/Makefile.am:
-	* performance-tests/Callback/Makefile.am:
-	* performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-	* performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-	* performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-	* performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-	* performance-tests/Latency/AMI/Makefile.am:
-	* performance-tests/Latency/Collocation/Makefile.am:
-	* performance-tests/Latency/DII/Makefile.am:
-	* performance-tests/Latency/DSI/Makefile.am:
-	* performance-tests/Latency/Deferred/Makefile.am:
-	* performance-tests/Latency/Single_Threaded/Makefile.am:
-	* performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-	* performance-tests/Latency/Thread_Pool/Makefile.am:
-	* performance-tests/Memory/IORsize/Makefile.am:
-	* performance-tests/Memory/Single_Threaded/Makefile.am:
-	* performance-tests/POA/Demux/Makefile.am:
-	* performance-tests/POA/Implicit_Activation/Makefile.am:
-	* performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-	* performance-tests/Pluggable/Makefile.am:
-	* performance-tests/Protocols/Makefile.am:
-	* performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-	* performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-	* performance-tests/RTCorba/Thread_Pool/Makefile.am:
-	* performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-	* performance-tests/Sequence_Latency/AMI/Makefile.am:
-	* performance-tests/Sequence_Latency/DII/Makefile.am:
-	* performance-tests/Sequence_Latency/DSI/Makefile.am:
-	* performance-tests/Sequence_Latency/Deferred/Makefile.am:
-	* performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-	* performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-	* performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-	* performance-tests/Throughput/Makefile.am:
-	* tao/Makefile.am:
-	* utils/Makefile.am:
+        * docs/tutorials/Quoter/Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Advanced/ch_3/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/Callback_Quoter/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/Event_Comm/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/Logging/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/Generic_Servant/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Quoter/Makefile.am:
+        * examples/RTCORBA/Activity/Makefile.am:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * examples/TypeCode_Creation/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * examples/mfc/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+        * orbsvcs/tests/FtRtEvent/Makefile.am:
+        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
+        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
+        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Redundant_Naming/Makefile.am:
+        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
+        * orbsvcs/tests/Simple_Naming/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+        * performance-tests/Makefile.am:
+        * performance-tests/Anyop/Makefile.am:
+        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
+        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Collocation/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Memory/IORsize/Makefile.am:
+        * performance-tests/Memory/Single_Threaded/Makefile.am:
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+        * tao/Makefile.am:
+        * utils/Makefile.am:
 
           Regenerated.
 
-	* configure.ac:
+        * configure.ac:
 
           Configure utils/wxNamingViewer/Makefile.am.
 
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 3aaf9bf3e1b..acf9febe00c 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -16,10 +16,7 @@
 #include "JobS.h"
 #include "Task_Stats.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 class DT_Creator;
 
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 28adbd31a18..92a15b22ea4 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -19,10 +19,7 @@
 #include "tao/PortableServer/PortableServer.h"
 //#include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class POA_Holder
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index de06aa31135..943d189c411 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -21,10 +21,10 @@
 
 #include "Task_Stats.h"
 #include "Notify_StructuredPushConsumer.h"
+#include "ace/Arg_Shifter.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-class ACE_Arg_Shifter;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Tests_Task_Callback;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 969f07cb4ec..5bcdf57d34c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -24,11 +24,7 @@
 #include "StructuredEvent.h"
 #include "ace/Task.h"
 #include "ace/Barrier.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Barrier;
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 class TAO_Notify_Tests_Task_Callback;