ChangeLogTag: Tue Mar 14 15:25:48 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

42 files changed, 127 insertions, 79 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8047b4ec181..7bd31439346 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,52 @@
+Tue Mar 14 15:25:48 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* tao/Domain.pidl:
+	* tao/GIOP.pidl:
+	* tao/IOP.pidl:
+	* tao/IOP_IOR.pidl:
+	* tao/Messaging_PolicyValue.pidl:
+	* tao/PI_Forward.pidl:
+	* tao/Policy.pidl:
+	* tao/PortableInterceptor.pidl:
+	* tao/Services.pidl:
+	* tao/TAO.pidl:
+	* tao/AnyTypeCode/Dynamic_Parameter.pidl:
+	* tao/BiDir_GIOP/BiDirPolicy.pidl:
+	* tao/CodecFactory/IOP_Codec.pidl:
+	* tao/CodecFactory/IOP_Codec_include.pidl:
+	* tao/DynamicAny/DynamicAny.pidl:
+	* tao/IFR_Client/IFR_Base.pidl:
+	* tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+	* tao/PI/ClientRequestInfo.pidl:
+	* tao/PI/ORBInitInfo.pidl:
+	* tao/PI/PICurrent.pidl:
+	* tao/PI/PolicyFactory.pidl:
+	* tao/PI/RequestInfo.pidl:
+	* tao/PI_Server/PI_Server_include.pidl:
+	* tao/PI_Server/ServerRequestInfo.pidl:
+	* tao/PI_Server/ServerRequestInterceptor.pidl:
+	* tao/PortableServer/AdapterActivator.pidl:
+	* tao/PortableServer/IdAssignmentPolicy.pidl:
+	* tao/PortableServer/IdUniquenessPolicy.pidl:
+	* tao/PortableServer/ImplicitActivationPolicy.pidl:
+	* tao/PortableServer/LifespanPolicy.pidl:
+	* tao/PortableServer/PS_Current.pidl:
+	* tao/PortableServer/PS_Forward.pidl:
+	* tao/PortableServer/PortableServer.pidl:
+	* tao/PortableServer/PortableServer_include.pidl:
+	* tao/PortableServer/RequestProcessingPolicy.pidl:
+	* tao/PortableServer/ServantActivator.pidl:
+	* tao/PortableServer/ServantLocator.pidl:
+	* tao/PortableServer/ServantRetentionPolicy.pidl:
+	* tao/PortableServer/ThreadPolicy.pidl:
+	* tao/RTCORBA/RTCORBA.pidl:
+	* tao/RTPortableServer/RTPortableServer_include.pidl:
+
+          Change #include <tao/...> to #include "tao/..." to avoid fuzz
+          warnings.  At the very least, this makes everyting consistant
+          while we are investigate and decide what #include conventions
+          for <...> vs. "..." to adopt.
+
 Tue Mar 14 06:02:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * orbsvcs/orbsvcs/...*.cpp:
@@ -8,7 +57,6 @@ Tue Mar 14 06:02:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
           Add "orbsvcs/..." prefix to #includes of *.h, *.i, *.inl, and
           template *.cpp files found in ${TAO_ROOT}/orbsvcs/orbsvcs.
 
-
 Mon Mar 13 19:51:12 UTC 2006  Johnny Willemsen  <jwilemsen@remedy.nl>
 
         * tests/Any/Recursive/client.cpp:
diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
index f90830a9ed1..038b00daf99 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -29,7 +29,7 @@
 #ifndef _DYNAMIC_PARAMETER_IDL_
 #define _DYNAMIC_PARAMETER_IDL_
 
-#include <tao/ParameterMode.pidl>
+#include "tao/ParameterMode.pidl"
 
 module Dynamic
 {
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index 0451bd354fd..876d32946fa 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -21,7 +21,7 @@
 
 #pragma prefix "omg.org"
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 // Self contained module for Bi-directional GIOP policy
 module BiDirPolicy
diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl
index de916277613..be4caae91b3 100644
--- a/TAO/tao/CodecFactory/IOP_Codec.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -25,9 +25,9 @@
 #ifndef TAO_IOP_CODEC_PIDL
 #define TAO_IOP_CODEC_PIDL
 
-#include <tao/Typecode_types.pidl>
-#include <tao/OctetSeq.pidl>
-#include <tao/CONV_FRAME.pidl>
+#include "tao/Typecode_types.pidl"
+#include "tao/OctetSeq.pidl"
+#include "tao/CONV_FRAME.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
index 0d459f675dd..7cb54a935a3 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -39,6 +39,6 @@
 #define _IOP_CODEC_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/CodecFactory/IOP_Codec.pidl>
+#include "tao/CodecFactory/IOP_Codec.pidl"
 
 #endif /* _IOP_CODEC_INCLUDE_IDL_ */
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index e73f2b9b575..b221159edee 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -47,8 +47,8 @@
 #ifndef TAO_CORBA_DOMAIN_PIDL
 #define TAO_CORBA_DOMAIN_PIDL
 
-#include <tao/Policy.pidl>
-#include <tao/InterfaceDef.pidl>
+#include "tao/Policy.pidl"
+#include "tao/InterfaceDef.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 69dbbf0c05d..1a8fe09cc21 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -52,7 +52,7 @@
 
 #pragma prefix "omg.org"
 
-#include <tao/Typecode_types.pidl>
+#include "tao/Typecode_types.pidl"
 
 module DynamicAny {
 
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 02092552b56..eb6e86ca8c4 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -28,7 +28,7 @@
 #ifndef TAO_GIOP_PIDL
 #define TAO_GIOP_PIDL
 
-#include <tao/IOP_IOR.pidl>
+#include "tao/IOP_IOR.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 9fa70ea44c7..02ee7037d5f 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -52,8 +52,8 @@
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#include <tao/orb_types.pidl>
-#include <tao/Typecode_types.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Typecode_types.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index dd4021c163d..90ed9c8b7f4 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -28,6 +28,6 @@
 #ifndef TAO_IOP_PIDL
 #define TAO_IOP_PIDL
 
-#include <tao/IOP_IOR.pidl>
+#include "tao/IOP_IOR.pidl"
 
 #endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
index f24952173ff..ab73e10ff0c 100644
--- a/TAO/tao/IOP_IOR.pidl
+++ b/TAO/tao/IOP_IOR.pidl
@@ -26,7 +26,7 @@
 #ifndef TAO_IOP_IOR_PIDL
 #define TAO_IOP_IOR_PIDL
 
-#include <tao/OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 459c59f3093..7775f89e4d1 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -23,8 +23,8 @@
 #ifndef TAO_MESSAGING_POLICYVALUE_PIDL
 #define TAO_MESSAGING_POLICYVALUE_PIDL
 
-#include <tao/IOP_IOR.pidl>
-#include <tao/Policy_Forward.pidl>
+#include "tao/IOP_IOR.pidl"
+#include "tao/Policy_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 497073db13c..f26d45984bc 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -33,7 +33,7 @@
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
-#include <tao/PI_Forward.pidl>
+#include "tao/PI_Forward.pidl"
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl
index 7701f7625ac..1a5baca1d14 100644
--- a/TAO/tao/PI/ClientRequestInfo.pidl
+++ b/TAO/tao/PI/ClientRequestInfo.pidl
@@ -23,8 +23,8 @@
 #define _CLIENT_REQUESTINFO_PIDL_
 
 #include "tao/PI/RequestInfo.pidl"
-#include <tao/orb_types.pidl>
-#include <tao/Policy_Forward.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Policy_Forward.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl
index 891ae85021c..052b05c0372 100644
--- a/TAO/tao/PI/ORBInitInfo.pidl
+++ b/TAO/tao/PI/ORBInitInfo.pidl
@@ -22,10 +22,10 @@
 #ifndef _ORBINITINFO_PIDL_
 #define _ORBINITINFO_PIDL_
 
-#include <tao/StringSeq.pidl>
+#include "tao/StringSeq.pidl"
 #include "tao/CodecFactory/IOP_Codec_include.pidl"
-#include <tao/PI_Forward.pidl>
-#include <tao/Policy.pidl>
+#include "tao/PI_Forward.pidl"
+#include "tao/Policy.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl
index 4952a8a0d5a..0ce4b8a7014 100644
--- a/TAO/tao/PI/PICurrent.pidl
+++ b/TAO/tao/PI/PICurrent.pidl
@@ -20,9 +20,9 @@
 #ifndef _PI_CURRENT_IDL_
 #define _PI_CURRENT_IDL_
 
-#include <tao/PI/InvalidSlot.pidl>
-#include <tao/PI_Forward.pidl>
-#include <tao/Current.pidl>
+#include "tao/PI/InvalidSlot.pidl"
+#include "tao/PI_Forward.pidl"
+#include "tao/Current.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl
index d70fe1b1eca..f2ee6020c5a 100644
--- a/TAO/tao/PI/PolicyFactory.pidl
+++ b/TAO/tao/PI/PolicyFactory.pidl
@@ -20,7 +20,7 @@
 #ifndef _POLICYFACTORY_PIDL_
 #define _POLICYFACTORY_PIDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index b86593c2e82..42830e28672 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -22,11 +22,11 @@
 #ifndef _REQUESTINFO_PIDL_
 #define _REQUESTINFO_PIDL_
 
-#include <tao/PI_Forward.pidl>
+#include "tao/PI_Forward.pidl"
 #include "tao/AnyTypeCode/Dynamic.pidl"
-#include <tao/Messaging_SyncScope.pidl>
+#include "tao/Messaging_SyncScope.pidl"
 #include "tao/PI/InvalidSlot.pidl"
-#include <tao/IOP_IOR.pidl>
+#include "tao/IOP_IOR.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 76fe46ca8c5..f704658e38c 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -32,8 +32,8 @@
 #ifndef _PI_FORWARD_IDL_
 #define _PI_FORWARD_IDL_
 
-#include <tao/OctetSeq.pidl>
-#include <tao/StringSeq.pidl>
+#include "tao/OctetSeq.pidl"
+#include "tao/StringSeq.pidl"
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl
index 0b86cdf7238..ad7b82138bf 100644
--- a/TAO/tao/PI_Server/PI_Server_include.pidl
+++ b/TAO/tao/PI_Server/PI_Server_include.pidl
@@ -10,6 +10,6 @@
 #define _PORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PI_Server/ServerRequestInterceptor.pidl>
+#include "tao/PI_Server/ServerRequestInterceptor.pidl"
 
 #endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl
index 1737cbd85f1..d8a4c52639d 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl
@@ -23,8 +23,8 @@
 #define _SERVER_REQUESTINFO_PIDL_
 
 #include "tao/PI/RequestInfo.pidl"
-#include <tao/orb_types.pidl>
-#include <tao/Policy_Forward.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Policy_Forward.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index edc735ae678..571b35e9c73 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -28,7 +28,7 @@
 
 #include "tao/PI/Interceptor.pidl"
 #include "tao/PI/PIForwardRequest.pidl"
-#include <tao/OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index c90bd3c4b87..62dfc3e50bc 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -44,9 +44,9 @@
 #ifndef TAO_CORBA_POLICY_PIDL
 #define TAO_CORBA_POLICY_PIDL
 
-#include <tao/UShortSeq.pidl>
-#include <tao/Current.pidl>
-#include <tao/Policy_Forward.pidl>
+#include "tao/UShortSeq.pidl"
+#include "tao/Current.pidl"
+#include "tao/Policy_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 731cfe3c958..fdf42e809ae 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -34,8 +34,8 @@
 #ifndef _PORTABLE_INTERCEPTOR_IDL_
 #define _PORTABLE_INTERCEPTOR_IDL_
 
-#include <tao/PI_Forward.pidl>
-#include <tao/Messaging_SyncScope.pidl>
+#include "tao/PI_Forward.pidl"
+#include "tao/Messaging_SyncScope.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl
index 0fa4dce9ee9..81adf4c3039 100644
--- a/TAO/tao/PortableServer/AdapterActivator.pidl
+++ b/TAO/tao/PortableServer/AdapterActivator.pidl
@@ -21,7 +21,7 @@
 #define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
index 9ecb482e4b6..7f06e39e614 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
index e354e871bd0..5175cb16d30 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
index 9ecb34f0dcd..976c399bc02 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl
index 96a4755e620..6ab38f36c71 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.pidl
+++ b/TAO/tao/PortableServer/LifespanPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_
 #define _PORTABLESERVER_LIFESPANPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl
index d01bb8cffff..91bd07204c6 100644
--- a/TAO/tao/PortableServer/PS_Current.pidl
+++ b/TAO/tao/PortableServer/PS_Current.pidl
@@ -21,8 +21,8 @@
 #define _PORTABLESERVER_CURRENT_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/Current.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/Current.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
index d8618bb921b..f475927eab9 100644
--- a/TAO/tao/PortableServer/PS_Forward.pidl
+++ b/TAO/tao/PortableServer/PS_Forward.pidl
@@ -24,7 +24,7 @@
 #ifndef _PORTABLESERVER_PS_FORWARD_IDL_
 #define _PORTABLESERVER_PS_FORWARD_IDL_
 
-#include <tao/OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 9fb25a6cec0..938c7edeaec 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -45,17 +45,17 @@
 #define _PORTABLE_SERVER_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/Policy_Forward.pidl>
-#include <tao/OctetSeq.pidl>
-#include <tao/orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/IdAssignmentPolicy.pidl>
-#include <tao/PortableServer/IdUniquenessPolicy.pidl>
-#include <tao/PortableServer/ImplicitActivationPolicy.pidl>
-#include <tao/PortableServer/LifespanPolicy.pidl>
-#include <tao/PortableServer/RequestProcessingPolicy.pidl>
-#include <tao/PortableServer/ServantRetentionPolicy.pidl>
-#include <tao/PortableServer/ThreadPolicy.pidl>
+#include "tao/Policy_Forward.pidl"
+#include "tao/OctetSeq.pidl"
+#include "tao/orb_types.pidl"
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/IdAssignmentPolicy.pidl"
+#include "tao/PortableServer/IdUniquenessPolicy.pidl"
+#include "tao/PortableServer/ImplicitActivationPolicy.pidl"
+#include "tao/PortableServer/LifespanPolicy.pidl"
+#include "tao/PortableServer/RequestProcessingPolicy.pidl"
+#include "tao/PortableServer/ServantRetentionPolicy.pidl"
+#include "tao/PortableServer/ThreadPolicy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl
index dd300389aa6..54132cd083d 100644
--- a/TAO/tao/PortableServer/PortableServer_include.pidl
+++ b/TAO/tao/PortableServer/PortableServer_include.pidl
@@ -35,6 +35,6 @@
 #define _PORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PortableServer.pidl>
+#include "tao/PortableServer/PortableServer.pidl"
 
 #endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
index 4b557ee6704..256defab1b9 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
index b51f5be5e2e..f84cffaa3b1 100644
--- a/TAO/tao/PortableServer/ServantActivator.pidl
+++ b/TAO/tao/PortableServer/ServantActivator.pidl
@@ -21,9 +21,9 @@
 #define _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/ServantManager.pidl"
+#include "tao/PortableServer/ForwardRequest.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
index 684291bfbe7..69b5961bafe 100644
--- a/TAO/tao/PortableServer/ServantLocator.pidl
+++ b/TAO/tao/PortableServer/ServantLocator.pidl
@@ -25,10 +25,10 @@
 #define _PORTABLESERVER_SERVANTLOCATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/ServantManager.pidl"
+#include "tao/PortableServer/ForwardRequest.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
index 46ab36fd24d..6301a5be4ca 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl
index ead0d6040fc..9f37950dfb4 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.pidl
+++ b/TAO/tao/PortableServer/ThreadPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_THREAD_POLICY_IDL_
 #define _PORTABLESERVER_THREAD_POLICY_IDL_
 
-#include <tao/Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index ad558db2a38..703ae6c7732 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -52,9 +52,9 @@
 #ifndef _RT_CORBA_IDL_
 #define _RT_CORBA_IDL_
 
-#include <tao/IOP.pidl>
-#include <tao/TimeBase.pidl>
-#include <tao/Policy.pidl>
+#include "tao/IOP.pidl"
+#include "tao/TimeBase.pidl"
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
index d67a85927c7..1d5a8883c79 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
@@ -35,6 +35,6 @@
 #define _RTPORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/RTPortableServer/RTPortableServer.pidl>
+#include "tao/RTPortableServer/RTPortableServer.pidl"
 
 #endif /* _RTPORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index b64e15a2bfd..c855d525ca0 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -22,7 +22,7 @@
 #ifndef TAO_CORBA_SERVICES_IDL
 #define TAO_CORBA_SERVICES_IDL
 
-#include <tao/OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index d464b6e3c7a..db7dd9b348a 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -28,9 +28,9 @@
 #ifndef TAO_TAO_IDL
 #define TAO_TAO_IDL
 
-#include <tao/Policy.pidl>
-#include <tao/TimeBase.pidl>
-#include <tao/Messaging_SyncScope.pidl>
+#include "tao/Policy.pidl"
+#include "tao/TimeBase.pidl"
+#include "tao/Messaging_SyncScope.pidl"
 
 #pragma prefix "tao"