summaryrefslogtreecommitdiff
path: root/TAO/tests/Portable_Interceptors
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Portable_Interceptors')
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp4
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h7
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h1
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h1
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/client.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h2
32 files changed, 30 insertions, 40 deletions
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
index 66862fa4561..41c892cfb4f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
@@ -10,7 +10,7 @@
#define Client_ORBInitializer__h_
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
class Client_ORBInitializer
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index 441b1649161..f02c068b74f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -10,7 +10,7 @@
#define Server_ORBInitializer__h_
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
class Server_ORBInitializer
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index f66e4e505c2..f26c625ffbe 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_CLIENT_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 3ef96adeea8..599301a17d9 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_SERVER_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index 8ea41d53689..569419fb346 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_CLIENT_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index d5aef56e289..5b3c199490d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_SERVER_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index be3545b69ac..9e1d7b79009 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_CLIENT_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 3e4ee86a067..7e8d6e28aa4 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -50,7 +50,6 @@ main (int argc, char *argv[])
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
-#if TAO_HAS_INTERCEPTORS == 1
PortableInterceptor::ORBInitializer_ptr temp_initializer =
PortableInterceptor::ORBInitializer::_nil ();
@@ -63,7 +62,6 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_Argv_Type_Converter satc (argc, argv);
CORBA::ORB_var sorb =
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
index 3a69c959972..879b3549b22 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
@@ -3,9 +3,6 @@
// $Id$
#include "Echo_Collocated_ORBInitializer.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
#include "interceptors.h"
#include "ace/OS_NS_string.h"
@@ -70,4 +67,3 @@ Echo_Collocated_ORBInitializer::post_init (
}
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index baa5f1e153a..7a18eb9b37a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -8,14 +8,11 @@
#include /**/ "ace/pre.h"
#include "tao/orbconf.h"
-
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
// This is to remove "inherits via dominance" warnings from MSVC.
@@ -45,8 +42,6 @@ public:
#pragma warning(pop)
#endif /* _MSC_VER */
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
#include /**/ "ace/post.h"
#endif /* TAO_ECHO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
index 7e113c65d9e..fdc67018fb0 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
@@ -1,9 +1,8 @@
// -*- MPC -*-
// $Id$
-project(*Collocated): taoserver {
+project(*Collocated): taoserver, interceptors {
exename = Collocated_Test
- requires += interceptors
Source_Files {
testC.cpp
testS.cpp
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 3e9beabf5b5..42b2ea926a4 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -4,7 +4,7 @@
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 7e4c72e5f1a..4b9cd5bf967 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,9 +1,8 @@
// -*- MPC -*-
// $Id$
-project(*Collocated): taoserver {
+project(*Collocated): taoserver, interceptors {
exename = collocated
- requires += interceptors
Source_Files {
testC.cpp
testS.cpp
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 9a8cfc12dce..cd09fcce9bd 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -7,7 +7,7 @@
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 1c6b82c715f..26b483304c7 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -7,7 +7,7 @@
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index 635a6ac9fa2..10386969df0 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -18,7 +18,7 @@
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 273bfca7145..90be3b9571a 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -18,7 +18,7 @@
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 615c249fe84..abe9074a545 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -22,6 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/PI/PI.h"
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index 334a3cbfe65..a047658b5a8 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 0440e38ffa5..3470e22c973 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -22,6 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/IORInterceptor/IORInterceptor.h"
+#include "tao/CodecFactory/CodecFactory.h"
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 384f57b8503..62daa94f1ae 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index f30aa4ef1f8..1498e7c020c 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -24,7 +24,7 @@
#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
// This is to remove "inherits via dominance" warnings from MSVC.
// MSVC is being a little too paranoid.
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index a9105a13a63..f540262ca7b 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index c2205ee7f2c..daa05dfb4ad 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -3,7 +3,7 @@
#include "ServerORBInitializer.h"
#include "ServerRequestInterceptor.h"
#include "ClientRequestInterceptor2.h"
-#include "tao/ORBInitInfo.h"
+#include "tao/PI/ORBInitInfo.h"
#include "tao/ORB_Core.h"
ACE_RCSID (PICurrent,
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index 52d5daaa7df..9c997d45f6c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index b4e2ab077c9..f09ea2b2b62 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -6,6 +6,7 @@
#include "ClientORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
+#include "tao/PICurrentC.h"
ACE_RCSID (PICurrent,
client,
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index 56946bab0ed..62baa04f807 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -21,7 +21,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index 47a0b3eef41..89be36a2898 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index 797dba654b6..9a14c62287c 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
// This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index ba25b3e7cf0..0d011a67032 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
// This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index 8ea41d53689..569419fb346 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_CLIENT_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index ff825e7d172..992070c71e1 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -7,7 +7,7 @@
#define TAO_SERVER_ORB_INITIALIZER_H
#include /**/ "ace/pre.h"
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once