Mon Oct 10 13:53:15 2005 Will Otte <wotte@dre.vanderbilt.edu>

37 files changed, 467 insertions, 366 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index d9d82a046f5..c0c15258bb8 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef BASIC_DEPLOYMENT_DATA_HPP
 #define BASIC_DEPLOYMENT_DATA_HPP
 
@@ -70,7 +70,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export TCKind : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
     {
       public:
       TCKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -123,10 +123,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator== (TCKind const& a, TCKind const& b);
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator!= (TCKind const& a, TCKind const& b);
 
       private:
@@ -135,12 +135,12 @@ namespace CIAO
       Value v_;
     };
 
-    bool Config_Handlers_Export operator== (TCKind const &a, TCKind const &b);
+    bool XSC_XML_Handlers_Export operator== (TCKind const &a, TCKind const &b);
 
-    bool Config_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
+    bool XSC_XML_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
 
 
-    class Config_Handlers_Export DataType : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export DataType : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -178,7 +178,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export DataValue : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export DataValue : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -392,7 +392,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export EnumType : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -445,7 +445,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Any : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Any : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -483,7 +483,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Property : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -521,7 +521,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
     {
       public:
       SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -543,10 +543,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
       private:
@@ -555,12 +555,12 @@ namespace CIAO
       Value v_;
     };
 
-    bool Config_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+    bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-    bool Config_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+    bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
 
-    class Config_Handlers_Export SatisfierProperty : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -608,7 +608,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Resource : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -656,7 +656,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Requirement : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -704,7 +704,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -752,7 +752,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -876,7 +876,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -975,7 +975,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
     {
       public:
       ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -996,10 +996,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
 
       private:
@@ -1008,12 +1008,12 @@ namespace CIAO
       Value v_;
     };
 
-    bool Config_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
+    bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
 
-    bool Config_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
+    bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
 
 
-    class Config_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1071,7 +1071,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1175,7 +1175,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
     {
       public:
       CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -1197,10 +1197,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
-      friend bool Config_Handlers_Export 
+      friend bool XSC_XML_Handlers_Export 
       operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
       private:
@@ -1209,12 +1209,12 @@ namespace CIAO
       Value v_;
     };
 
-    bool Config_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+    bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
 
-    bool Config_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+    bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
 
 
-    class Config_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1312,7 +1312,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1350,7 +1350,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1378,7 +1378,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1436,7 +1436,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1464,7 +1464,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1522,7 +1522,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1635,7 +1635,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ImplementationDependency : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ImplementationDependency : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1663,7 +1663,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Capability : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Capability : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1711,7 +1711,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1789,7 +1789,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1837,7 +1837,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1875,7 +1875,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -1978,7 +1978,7 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
       TCKind;
 
-      struct Config_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
+      struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
       {
         virtual void
         traverse (Type&);
@@ -2017,7 +2017,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
+      struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
       {
         virtual void
         traverse (Type&);
@@ -2428,7 +2428,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
+      struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
       {
         virtual void
         traverse (Type&);
@@ -2485,7 +2485,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
+      struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
       {
         virtual void
         traverse (Type&);
@@ -2518,7 +2518,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
+      struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
       {
         virtual void
         traverse (Type&);
@@ -2555,7 +2555,7 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
       SatisfierPropertyKind;
 
-      struct Config_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
+      struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
       {
         virtual void
         traverse (Type&);
@@ -2594,7 +2594,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
+      struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
       {
         virtual void
         traverse (Type&);
@@ -2633,7 +2633,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
+      struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
       {
         virtual void
         traverse (Type&);
@@ -2672,7 +2672,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
+      struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -2711,7 +2711,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
+      struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -2894,7 +2894,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
+      struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -3045,7 +3045,7 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
       ResourceUsageKind;
 
-      struct Config_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
+      struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -3090,7 +3090,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
+      struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -3205,7 +3205,7 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
       CCMComponentPortKind;
 
-      struct Config_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
+      struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
       {
         virtual void
         traverse (Type&);
@@ -3274,7 +3274,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
+      struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
       {
         virtual void
         traverse (Type&);
@@ -3307,7 +3307,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
+      struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
       {
         virtual void
         traverse (Type&);
@@ -3334,7 +3334,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
+      struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
       {
         virtual void
         traverse (Type&);
@@ -3385,7 +3385,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
+      struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
       {
         virtual void
         traverse (Type&);
@@ -3412,7 +3412,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
+      struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
       {
         virtual void
         traverse (Type&);
@@ -3457,7 +3457,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
+      struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
       {
         virtual void
         traverse (Type&);
@@ -3646,7 +3646,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
+      struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
       {
         virtual void
         traverse (Type&);
@@ -3673,7 +3673,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
+      struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
       {
         virtual void
         traverse (Type&);
@@ -3712,7 +3712,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
+      struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
       {
         virtual void
         traverse (Type&);
@@ -3769,7 +3769,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
+      struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
       {
         virtual void
         traverse (Type&);
@@ -3808,7 +3808,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
+      struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
       {
         virtual void
         traverse (Type&);
@@ -3841,7 +3841,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
+      struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
       {
         virtual void
         traverse (Type&);
@@ -3981,7 +3981,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export TCKind : Traversal::TCKind, 
+      struct XSC_XML_Handlers_Export TCKind : Traversal::TCKind, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
@@ -4001,7 +4001,7 @@ namespace CIAO
         TCKind ();
       };
 
-      struct Config_Handlers_Export DataType : Traversal::DataType, 
+      struct XSC_XML_Handlers_Export DataType : Traversal::DataType, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::DataType Type;
@@ -4052,7 +4052,7 @@ namespace CIAO
         DataType ();
       };
 
-      struct Config_Handlers_Export DataValue : Traversal::DataValue, 
+      struct XSC_XML_Handlers_Export DataValue : Traversal::DataValue, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::DataValue Type;
@@ -4621,7 +4621,7 @@ namespace CIAO
         DataValue ();
       };
 
-      struct Config_Handlers_Export EnumType : Traversal::EnumType, 
+      struct XSC_XML_Handlers_Export EnumType : Traversal::EnumType, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::EnumType Type;
@@ -4714,7 +4714,7 @@ namespace CIAO
         EnumType ();
       };
 
-      struct Config_Handlers_Export Any : Traversal::Any, 
+      struct XSC_XML_Handlers_Export Any : Traversal::Any, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Any Type;
@@ -4765,7 +4765,7 @@ namespace CIAO
         Any ();
       };
 
-      struct Config_Handlers_Export Property : Traversal::Property, 
+      struct XSC_XML_Handlers_Export Property : Traversal::Property, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Property Type;
@@ -4816,7 +4816,7 @@ namespace CIAO
         Property ();
       };
 
-      struct Config_Handlers_Export SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
+      struct XSC_XML_Handlers_Export SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
@@ -4836,7 +4836,7 @@ namespace CIAO
         SatisfierPropertyKind ();
       };
 
-      struct Config_Handlers_Export SatisfierProperty : Traversal::SatisfierProperty, 
+      struct XSC_XML_Handlers_Export SatisfierProperty : Traversal::SatisfierProperty, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
@@ -4901,7 +4901,7 @@ namespace CIAO
         SatisfierProperty ();
       };
 
-      struct Config_Handlers_Export Resource : Traversal::Resource, 
+      struct XSC_XML_Handlers_Export Resource : Traversal::Resource, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Resource Type;
@@ -4966,7 +4966,7 @@ namespace CIAO
         Resource ();
       };
 
-      struct Config_Handlers_Export Requirement : Traversal::Requirement, 
+      struct XSC_XML_Handlers_Export Requirement : Traversal::Requirement, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Requirement Type;
@@ -5031,7 +5031,7 @@ namespace CIAO
         Requirement ();
       };
 
-      struct Config_Handlers_Export ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
+      struct XSC_XML_Handlers_Export ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
@@ -5096,7 +5096,7 @@ namespace CIAO
         ResourceDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, 
+      struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
@@ -5371,7 +5371,7 @@ namespace CIAO
         ArtifactDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
+      struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
@@ -5590,7 +5590,7 @@ namespace CIAO
         MonolithicDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export ResourceUsageKind : Traversal::ResourceUsageKind, 
+      struct XSC_XML_Handlers_Export ResourceUsageKind : Traversal::ResourceUsageKind, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
@@ -5610,7 +5610,7 @@ namespace CIAO
         ResourceUsageKind ();
       };
 
-      struct Config_Handlers_Export InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
+      struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
@@ -5689,7 +5689,7 @@ namespace CIAO
         InstanceResourceDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, 
+      struct XSC_XML_Handlers_Export InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
@@ -5852,7 +5852,7 @@ namespace CIAO
         InstanceDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export CCMComponentPortKind : Traversal::CCMComponentPortKind, 
+      struct XSC_XML_Handlers_Export CCMComponentPortKind : Traversal::CCMComponentPortKind, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
@@ -5872,7 +5872,7 @@ namespace CIAO
         CCMComponentPortKind ();
       };
 
-      struct Config_Handlers_Export ComponentPortDescription : Traversal::ComponentPortDescription, 
+      struct XSC_XML_Handlers_Export ComponentPortDescription : Traversal::ComponentPortDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
@@ -6007,7 +6007,7 @@ namespace CIAO
         ComponentPortDescription ();
       };
 
-      struct Config_Handlers_Export ComponentPropertyDescription : Traversal::ComponentPropertyDescription, 
+      struct XSC_XML_Handlers_Export ComponentPropertyDescription : Traversal::ComponentPropertyDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
@@ -6058,7 +6058,7 @@ namespace CIAO
         ComponentPropertyDescription ();
       };
 
-      struct Config_Handlers_Export ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, 
+      struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
@@ -6095,7 +6095,7 @@ namespace CIAO
         ComponentExternalPortEndpoint ();
       };
 
-      struct Config_Handlers_Export PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
+      struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
@@ -6174,7 +6174,7 @@ namespace CIAO
         PlanSubcomponentPortEndpoint ();
       };
 
-      struct Config_Handlers_Export ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
+      struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
@@ -6211,7 +6211,7 @@ namespace CIAO
         ExternalReferenceEndpoint ();
       };
 
-      struct Config_Handlers_Export ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
+      struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
@@ -6290,7 +6290,7 @@ namespace CIAO
         ConnectionResourceDeploymentDescription ();
       };
 
-      struct Config_Handlers_Export PlanConnectionDescription : Traversal::PlanConnectionDescription, 
+      struct XSC_XML_Handlers_Export PlanConnectionDescription : Traversal::PlanConnectionDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
@@ -6551,7 +6551,7 @@ namespace CIAO
         PlanConnectionDescription ();
       };
 
-      struct Config_Handlers_Export ImplementationDependency : Traversal::ImplementationDependency, 
+      struct XSC_XML_Handlers_Export ImplementationDependency : Traversal::ImplementationDependency, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
@@ -6588,7 +6588,7 @@ namespace CIAO
         ImplementationDependency ();
       };
 
-      struct Config_Handlers_Export Capability : Traversal::Capability, 
+      struct XSC_XML_Handlers_Export Capability : Traversal::Capability, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Capability Type;
@@ -6653,7 +6653,7 @@ namespace CIAO
         Capability ();
       };
 
-      struct Config_Handlers_Export ImplementationRequirement : Traversal::ImplementationRequirement, 
+      struct XSC_XML_Handlers_Export ImplementationRequirement : Traversal::ImplementationRequirement, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
@@ -6760,7 +6760,7 @@ namespace CIAO
         ImplementationRequirement ();
       };
 
-      struct Config_Handlers_Export ComponentPackageReference : Traversal::ComponentPackageReference, 
+      struct XSC_XML_Handlers_Export ComponentPackageReference : Traversal::ComponentPackageReference, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
@@ -6825,7 +6825,7 @@ namespace CIAO
         ComponentPackageReference ();
       };
 
-      struct Config_Handlers_Export SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
+      struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
@@ -6876,7 +6876,7 @@ namespace CIAO
         SubcomponentPortEndpoint ();
       };
 
-      struct Config_Handlers_Export AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, 
+      struct XSC_XML_Handlers_Export AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 36ba2ff72c9..5bd587e1bed 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -2,7 +2,7 @@
 
 project (XSC_XML_Handlers) : acelib, xerces {
   sharedname    += XSC_XML_Handlers
-  dynamicflags  = CONFIG_HANDLERS_BUILD_DLL
+  dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
   requires     += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
@@ -21,7 +21,7 @@ project (XSC_XML_Handlers) : acelib, xerces {
   }
 }
 
-project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
+project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces, dynamicany {
   after += RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
@@ -31,7 +31,6 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
   libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
 
   Source_Files {
-    Basic_Deployment_Data.cpp
     DP_Handler.cpp
     CCD_Handler.cpp
     Property_Handler.cpp
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
index cb4da8b43f8..c33185ccf93 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef DEPLOYMENT_HPP
 #define DEPLOYMENT_HPP
 
@@ -59,35 +59,35 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::Domain
     domain (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::DeploymentPlan
     deploymentPlan (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::ImplementationArtifactDescription
     implementationArtifactDescription (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::ComponentInterfaceDescription
     componentInterfaceDescription (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::ComponentImplementationDescription
     componentImplementationDescription (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::ComponentPackageDescription
     componentPackageDescription (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::PackageConfiguration
     packageConfiguration (xercesc::DOMDocument const*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::TopLevelPackageDescription
     topLevelPackageDescription (xercesc::DOMDocument const*);
   }
@@ -121,35 +121,35 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
 
-    Config_Handlers_Export
+    XSC_XML_Handlers_Export
     void
     topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 485c797f5af..c9ba2c09f31 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -3,6 +3,7 @@
 project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory {
   after += XSC_XML_Handlers
   libs += XSC_XML_Handlers
+  dynamicflags += DYNANY_HANDLER_BUILD_DLL
   macros += XML_USE_PTHREADS
   requires += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
index 3fcc798795a..af81ace52ff 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
@@ -12,7 +12,7 @@
 #define CIAO_CONFIG_HANDLERS_DYNANY_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "DynAny_Handler_Export.h"
 
 #include "tao/ORB.h"
 #include "tao/DynamicAny/DynamicAny.h"
@@ -40,7 +40,7 @@ namespace CIAO
     * corresponding CORBA IDL Any type.
     *
     */
-    class Config_Handlers_Export DynAny_Handler
+    class DynAny_Handler_Export DynAny_Handler
     {
     public:
       DynAny_Handler ();
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
new file mode 100644
index 00000000000..78a3ee57b77
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DynAny_Handler
+// ------------------------------
+#ifndef DYNANY_HANDLER_EXPORT_H
+#define DYNANY_HANDLER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (DYNANY_HANDLER_HAS_DLL)
+#  define DYNANY_HANDLER_HAS_DLL 1
+#endif /* ! DYNANY_HANDLER_HAS_DLL */
+
+#if defined (DYNANY_HANDLER_HAS_DLL) && (DYNANY_HANDLER_HAS_DLL == 1)
+#  if defined (DYNANY_HANDLER_BUILD_DLL)
+#    define DynAny_Handler_Export ACE_Proper_Export_Flag
+#    define DYNANY_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DYNANY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DYNANY_HANDLER_BUILD_DLL */
+#    define DynAny_Handler_Export ACE_Proper_Import_Flag
+#    define DYNANY_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DYNANY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DYNANY_HANDLER_BUILD_DLL */
+#else /* DYNANY_HANDLER_HAS_DLL == 1 */
+#  define DynAny_Handler_Export
+#  define DYNANY_HANDLER_SINGLETON_DECLARATION(T)
+#  define DYNANY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DYNANY_HANDLER_HAS_DLL == 1 */
+
+// Set DYNANY_HANDLER_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DYNANY_HANDLER_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DYNANY_HANDLER_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DYNANY_HANDLER_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DYNANY_HANDLER_NTRACE */
+
+#if (DYNANY_HANDLER_NTRACE == 1)
+#  define DYNANY_HANDLER_TRACE(X)
+#else /* (DYNANY_HANDLER_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DYNANY_HANDLER_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DYNANY_HANDLER_NTRACE == 1) */
+
+#endif /* DYNANY_HANDLER_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 447bb6aa1c6..9203b32ba58 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -9,7 +9,7 @@
 #define CIAO_CONFIG_HANDLERS_DYNENUM_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "DynAny_Handler_Export.h"
 
 #include "tao/ORB.h"
 #include "tao/DynamicAny/DynamicAny.h"
@@ -31,7 +31,7 @@ namespace CIAO
      * @brief Translates enums specified in deployment plans into Dynamic Anys
      *
      */
-    class Config_Handlers_Export DynEnum_Handler
+    class DynEnum_Handler
     {
     public:
       static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
index 445322b69f6..6f29866c9ac 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
@@ -33,7 +33,7 @@ namespace CIAO
      *
      */
     template <typename T>
-    class Config_Handlers_Export IDREF_Base
+    class IDREF_Base
     {
     public:
       /// Bind an IDREF to an index
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
index 0c0f3007930..338a21e134c 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
@@ -12,7 +12,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 #include "IDREF_Base.h"
 
@@ -31,7 +31,7 @@ namespace CIAO
 	 * A brief Handler class for <ConnectionBands>
 	 */
 
-	class Config_Handlers_Export CB_Handler
+	class RT_CCM_Handlers_Export CB_Handler
 	{
         public:
           static bool connection_band (const ConnectionBandsDef &src,
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index 376e97b13e0..a110fef5e4d 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -19,7 +19,8 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
+
 #ifndef CIAOSERVER_RESOURCES_HPP
 #define CIAOSERVER_RESOURCES_HPP
 
@@ -54,7 +55,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export ServerResourcesDef : public ::XSCRT::Type
+    class  ServerResourcesDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -116,7 +117,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ServerCmdlineOptions : public ::XSCRT::Type
+    class  ServerCmdlineOptions : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -150,7 +151,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ACESvcConf : public ::XSCRT::Type
+    class  ACESvcConf : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -180,7 +181,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ORBConfigs : public ::XSCRT::Type
+    class  ORBConfigs : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -225,7 +226,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ORBResources : public ::XSCRT::Type
+    class  ORBResources : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -289,7 +290,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Priority : public ::XMLSchema::int_
+    class  Priority : public ::XMLSchema::int_
     {
       //@@ VC6 anathema
       typedef ::XMLSchema::int_ Base__;
@@ -308,7 +309,7 @@ namespace CIAO
       char regulator__;
     };
 
-    class Config_Handlers_Export ThreadpoolDef : public ::XSCRT::Type
+    class  ThreadpoolDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -414,7 +415,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ThreadpoolWithLanesDef : public ::XSCRT::Type
+    class  ThreadpoolWithLanesDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -513,7 +514,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ThreadpoolLaneDef : public ::XSCRT::Type
+    class  ThreadpoolLaneDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -564,7 +565,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ConnectionBandsDef : public ::XSCRT::Type
+    class  ConnectionBandsDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -609,7 +610,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PriorityBandDef : public ::XSCRT::Type
+    class  PriorityBandDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -649,7 +650,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PolicySet : public ::XSCRT::Type
+    class  PolicySet : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -724,7 +725,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PriorityModel : public ::XSCRT::Type
+    class  PriorityModel : public ::XSCRT::Type
     {
       public:
       PriorityModel (::XSCRT::XML::Element< ACE_TCHAR > const&);
@@ -755,7 +756,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export PriorityModelPolicyDef : public ::XSCRT::Type
+    class  PriorityModelPolicyDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -800,7 +801,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    Config_Handlers_Export
+    
     ::CIAO::Config_Handlers::ServerResourcesDef
     ServerResources (xercesc::DOMDocument const*);
   }
@@ -814,7 +815,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export ServerResourcesDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ServerResourcesDef >
+      struct  ServerResourcesDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ServerResourcesDef >
       {
         virtual void
         traverse (Type&);
@@ -877,7 +878,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ServerCmdlineOptions : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ServerCmdlineOptions >
+      struct  ServerCmdlineOptions : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ServerCmdlineOptions >
       {
         virtual void
         traverse (Type&);
@@ -922,7 +923,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ACESvcConf : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ACESvcConf >
+      struct  ACESvcConf : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ACESvcConf >
       {
         virtual void
         traverse (Type&);
@@ -955,7 +956,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ORBConfigs : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ORBConfigs >
+      struct  ORBConfigs : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ORBConfigs >
       {
         virtual void
         traverse (Type&);
@@ -1012,7 +1013,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ORBResources : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ORBResources >
+      struct  ORBResources : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ORBResources >
       {
         virtual void
         traverse (Type&);
@@ -1123,7 +1124,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Priority : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Priority >
+      struct  Priority : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Priority >
       {
         virtual void
         traverse (Type&);
@@ -1144,7 +1145,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ThreadpoolDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolDef >
+      struct  ThreadpoolDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolDef >
       {
         virtual void
         traverse (Type&);
@@ -1219,7 +1220,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ThreadpoolWithLanesDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >
+      struct  ThreadpoolWithLanesDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >
       {
         virtual void
         traverse (Type&);
@@ -1306,7 +1307,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ThreadpoolLaneDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolLaneDef >
+      struct  ThreadpoolLaneDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ThreadpoolLaneDef >
       {
         virtual void
         traverse (Type&);
@@ -1345,7 +1346,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ConnectionBandsDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionBandsDef >
+      struct  ConnectionBandsDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionBandsDef >
       {
         virtual void
         traverse (Type&);
@@ -1402,7 +1403,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export PriorityBandDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityBandDef >
+      struct  PriorityBandDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityBandDef >
       {
         virtual void
         traverse (Type&);
@@ -1435,7 +1436,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export PolicySet : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PolicySet >
+      struct  PolicySet : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PolicySet >
       {
         virtual void
         traverse (Type&);
@@ -1562,7 +1563,7 @@ namespace CIAO
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityModel >
       PriorityModel;
 
-      struct Config_Handlers_Export PriorityModelPolicyDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityModelPolicyDef >
+      struct  PriorityModelPolicyDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PriorityModelPolicyDef >
       {
         virtual void
         traverse (Type&);
@@ -2765,7 +2766,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    Config_Handlers_Export
+    
     void
     ServerResources (::CIAO::Config_Handlers::ServerResourcesDef const&, xercesc::DOMDocument*);
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 0e4f512da73..13d115a5b2d 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -33,7 +33,7 @@ namespace CIAO
 	 * This is a brief Handler class for <CommandlineArg>
 	 */
 	
-	class Config_Handlers_Export CLA_Handler
+	class RT_CCM_Handlers_Export CLA_Handler
 	{
 	public:
 	    static bool
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/Config_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/Config_Handlers_Export.h
deleted file mode 100644
index 64dec8bdfa5..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/Config_Handlers_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s Config_Handlers
-// ------------------------------
-#ifndef CONFIG_HANDLERS_EXPORT_H
-#define CONFIG_HANDLERS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIG_HANDLERS_HAS_DLL)
-#  define CONFIG_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONFIG_HANDLERS_HAS_DLL */
-
-#if !defined (CONFIG_HANDLERS_HAS_DLL)
-#  define CONFIG_HANDLERS_HAS_DLL 1
-#endif /* ! CONFIG_HANDLERS_HAS_DLL */
-
-#if defined (CONFIG_HANDLERS_HAS_DLL) && (CONFIG_HANDLERS_HAS_DLL == 1)
-#  if defined (CONFIG_HANDLERS_BUILD_DLL)
-#    define Config_Handlers_Export ACE_Proper_Export_Flag
-#    define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONFIG_HANDLERS_BUILD_DLL */
-#    define Config_Handlers_Export ACE_Proper_Import_Flag
-#    define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONFIG_HANDLERS_BUILD_DLL */
-#else /* CONFIG_HANDLERS_HAS_DLL == 1 */
-#  define Config_Handlers_Export
-#  define CONFIG_HANDLERS_SINGLETON_DECLARATION(T)
-#  define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONFIG_HANDLERS_HAS_DLL == 1 */
-
-// Set CONFIG_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONFIG_HANDLERS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONFIG_HANDLERS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONFIG_HANDLERS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONFIG_HANDLERS_NTRACE */
-
-#if (CONFIG_HANDLERS_NTRACE == 1)
-#  define CONFIG_HANDLERS_TRACE(X)
-#else /* (CONFIG_HANDLERS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONFIG_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONFIG_HANDLERS_NTRACE == 1) */
-
-#endif /* CONFIG_HANDLERS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index 97db9b40973..ab702e321f9 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -33,7 +33,7 @@ namespace CIAO
 	 * @brief Handler class for <ORBConfigs>
 	 */
 
-	class Config_Handlers_Export OC_Handler
+	class RT_CCM_Handlers_Export OC_Handler
 	{
 	public:
           static bool orb_config (const ORBConfigs &src,
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index ace7f5a1549..928ed1bb286 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ciao/ServerResourcesC.h"
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +32,7 @@ namespace CIAO
 	 * @function A brief Handler class for the <ORBResource> member
 	 */
 
-	class Config_Handlers_Export OR_Handler
+	class RT_CCM_Handlers_Export OR_Handler
 	{
 	public:
           
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
index 6eb21221418..2ebe0fb0c0e 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
@@ -11,7 +11,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -29,7 +29,7 @@ namespace CIAO
        * @brief Handler class for PriorityModelPolicyDefs
        */
       
-      class Config_Handlers_Export PM_Handler
+      class RT_CCM_Handlers_Export PM_Handler
       {
       public:
         static bool priority_model_pd (const PriorityModelPolicyDef &src,
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 8b0c9d9dbfb..5d924587fa9 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
@@ -11,7 +11,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -29,7 +29,7 @@ namespace CIAO
        * @brief Handler class for PolicySets
        */
       
-      class Config_Handlers_Export PS_Handler
+      class RT_CCM_Handlers_Export PS_Handler
       {
       public:
         static bool policy_set (const PolicySet &src,
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
index fb154177fad..9bff5006b60 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
@@ -2,7 +2,7 @@
 
 project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
   sharedname = RT_CCM_Config_Handlers
-  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+  dynamicflags   = RT_CCM_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
   requires += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
new file mode 100644
index 00000000000..fdba117ae61
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl RT_CCM_Handlers
+// ------------------------------
+#ifndef RT_CCM_HANDLERS_EXPORT_H
+#define RT_CCM_HANDLERS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (RT_CCM_HANDLERS_HAS_DLL)
+#  define RT_CCM_HANDLERS_HAS_DLL 1
+#endif /* ! RT_CCM_HANDLERS_HAS_DLL */
+
+#if defined (RT_CCM_HANDLERS_HAS_DLL) && (RT_CCM_HANDLERS_HAS_DLL == 1)
+#  if defined (RT_CCM_HANDLERS_BUILD_DLL)
+#    define RT_CCM_Handlers_Export ACE_Proper_Export_Flag
+#    define RT_CCM_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define RT_CCM_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* RT_CCM_HANDLERS_BUILD_DLL */
+#    define RT_CCM_Handlers_Export ACE_Proper_Import_Flag
+#    define RT_CCM_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define RT_CCM_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* RT_CCM_HANDLERS_BUILD_DLL */
+#else /* RT_CCM_HANDLERS_HAS_DLL == 1 */
+#  define RT_CCM_Handlers_Export
+#  define RT_CCM_HANDLERS_SINGLETON_DECLARATION(T)
+#  define RT_CCM_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* RT_CCM_HANDLERS_HAS_DLL == 1 */
+
+// Set RT_CCM_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (RT_CCM_HANDLERS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define RT_CCM_HANDLERS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define RT_CCM_HANDLERS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !RT_CCM_HANDLERS_NTRACE */
+
+#if (RT_CCM_HANDLERS_NTRACE == 1)
+#  define RT_CCM_HANDLERS_TRACE(X)
+#else /* (RT_CCM_HANDLERS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define RT_CCM_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (RT_CCM_HANDLERS_NTRACE == 1) */
+
+#endif /* RT_CCM_HANDLERS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index dd8e5ee8ca1..cfa7871b705 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -13,7 +13,7 @@
 #define CIAO_CONFIG_HANDLERS_SRD_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 #include "ace/Auto_Ptr.h"
 // #include "Utils/XML_Helper.h"
@@ -34,7 +34,7 @@ namespace CIAO
 	 * @brief Handler class for <ServerResourcesDef
 	 */
 
-	class Config_Handlers_Export SRD_Handler
+	class RT_CCM_Handlers_Export SRD_Handler
 	{
 	public:
           class NoSRD {};
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
index 1748552d9f6..e11fbc28dc2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
@@ -16,7 +16,7 @@
 
 #include "ciao/ServerResourcesC.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 
 namespace CIAO
 {
@@ -29,7 +29,7 @@ namespace CIAO
 	 *  A brief Handler class for <ThreadpoolWithLanesDef>
 	 */
 
-	class Config_Handlers_Export TPL_Handler
+	class RT_CCM_Handlers_Export TPL_Handler
 	{
 	public:
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index 09f641229e8..638ab07f675 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "RT_CCM_Handlers_Export.h"
 #include "ciao/ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -31,7 +31,7 @@ namespace CIAO
 	 * A brief Handler class for <ThreadpoolDef>
 	 */
 
-	class Config_Handlers_Export TP_Handler
+	class RT_CCM_Handlers_Export TP_Handler
 	{
         public:
           static bool thread_pool (const ThreadpoolDef &src,
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
index f6297da18c8..e8a05932f4b 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
@@ -67,4 +67,4 @@
       
     </policySet>
   </orbConfigs>
-</CIAO:ServerResources>
\ No newline at end of file
+</CIAO:ServerResources>
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h b/TAO/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h
new file mode 100644
index 00000000000..f4f3ec3a1cd
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl CIAO_XML_Utils
+// ------------------------------
+#ifndef CIAO_XML_UTILS_EXPORT_H
+#define CIAO_XML_UTILS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (CIAO_XML_UTILS_HAS_DLL)
+#  define CIAO_XML_UTILS_HAS_DLL 1
+#endif /* ! CIAO_XML_UTILS_HAS_DLL */
+
+#if defined (CIAO_XML_UTILS_HAS_DLL) && (CIAO_XML_UTILS_HAS_DLL == 1)
+#  if defined (CIAO_XML_UTILS_BUILD_DLL)
+#    define CIAO_XML_Utils_Export ACE_Proper_Export_Flag
+#    define CIAO_XML_UTILS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* CIAO_XML_UTILS_BUILD_DLL */
+#    define CIAO_XML_Utils_Export ACE_Proper_Import_Flag
+#    define CIAO_XML_UTILS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* CIAO_XML_UTILS_BUILD_DLL */
+#else /* CIAO_XML_UTILS_HAS_DLL == 1 */
+#  define CIAO_XML_Utils_Export
+#  define CIAO_XML_UTILS_SINGLETON_DECLARATION(T)
+#  define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CIAO_XML_UTILS_HAS_DLL == 1 */
+
+// Set CIAO_XML_UTILS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CIAO_XML_UTILS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define CIAO_XML_UTILS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define CIAO_XML_UTILS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !CIAO_XML_UTILS_NTRACE */
+
+#if (CIAO_XML_UTILS_NTRACE == 1)
+#  define CIAO_XML_UTILS_TRACE(X)
+#else /* (CIAO_XML_UTILS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define CIAO_XML_UTILS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (CIAO_XML_UTILS_NTRACE == 1) */
+
+#endif /* CIAO_XML_UTILS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Config_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/Utils/Config_Handlers_Export.h
deleted file mode 100644
index 64dec8bdfa5..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/Utils/Config_Handlers_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s Config_Handlers
-// ------------------------------
-#ifndef CONFIG_HANDLERS_EXPORT_H
-#define CONFIG_HANDLERS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIG_HANDLERS_HAS_DLL)
-#  define CONFIG_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONFIG_HANDLERS_HAS_DLL */
-
-#if !defined (CONFIG_HANDLERS_HAS_DLL)
-#  define CONFIG_HANDLERS_HAS_DLL 1
-#endif /* ! CONFIG_HANDLERS_HAS_DLL */
-
-#if defined (CONFIG_HANDLERS_HAS_DLL) && (CONFIG_HANDLERS_HAS_DLL == 1)
-#  if defined (CONFIG_HANDLERS_BUILD_DLL)
-#    define Config_Handlers_Export ACE_Proper_Export_Flag
-#    define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONFIG_HANDLERS_BUILD_DLL */
-#    define Config_Handlers_Export ACE_Proper_Import_Flag
-#    define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONFIG_HANDLERS_BUILD_DLL */
-#else /* CONFIG_HANDLERS_HAS_DLL == 1 */
-#  define Config_Handlers_Export
-#  define CONFIG_HANDLERS_SINGLETON_DECLARATION(T)
-#  define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONFIG_HANDLERS_HAS_DLL == 1 */
-
-// Set CONFIG_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONFIG_HANDLERS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONFIG_HANDLERS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONFIG_HANDLERS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONFIG_HANDLERS_NTRACE */
-
-#if (CONFIG_HANDLERS_NTRACE == 1)
-#  define CONFIG_HANDLERS_TRACE(X)
-#else /* (CONFIG_HANDLERS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONFIG_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONFIG_HANDLERS_NTRACE == 1) */
-
-#endif /* CONFIG_HANDLERS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
index 875cb423d55..359af0af27a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
@@ -3,7 +3,7 @@
 project (CIAO_XML_Utils) : acelib, xerces {
   includes += $(CIAO_ROOT)/tools/Config_Handlers
   sharedname   += CIAO_XML_Utils
-  dynamicflags  = CONFIG_HANDLERS_BUILD_DLL
+  dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
   macros       += XML_USE_PTHREADS
   requires     += exceptions
   
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h
index 5d5dcbdde1e..1b338de6773 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "CIAO_XML_Utils_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -35,7 +35,7 @@ namespace CIAO
      * @brief Error handler for XERCES
      *
      */
-    class Config_Handlers_Export XML_Error_Handler
+    class XML_Error_Handler
       : public DOMErrorHandler
     {
     public:
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
index 024df5264ae..50c05f3472d 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
@@ -12,7 +12,7 @@
 #define CIAO_CONFIG_HANDLERS_XML_HELPER_H
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "CIAO_XML_Utils_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@ namespace CIAO
      *
      * @brief Helper class for some routine XML stuff.
      */
-    class Config_Handlers_Export XML_Helper
+    class CIAO_XML_Utils_Export XML_Helper
     {
     public:
       XML_Helper (void);
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
index c80d82e7193..f4573fe20cc 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
@@ -11,7 +11,7 @@
 #define CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
 #include /**/ "ace/pre.h"
 
-#include "Config_Handlers_Export.h"
+#include "CIAO_XML_Utils_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,7 +33,7 @@ namespace CIAO
      * @class CIAO_Schema_Resolver
      * @brief Resolves schema locations for CIAO.
      */
-    class Config_Handlers_Export CIAO_Schema_Resolver
+    class CIAO_Schema_Resolver
       : public virtual DOMEntityResolver
     {
     public:
diff --git a/TAO/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h
new file mode 100644
index 00000000000..82272eb6c05
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl XSC_XML_Handlers
+// ------------------------------
+#ifndef XSC_XML_HANDLERS_EXPORT_H
+#define XSC_XML_HANDLERS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (XSC_XML_HANDLERS_HAS_DLL)
+#  define XSC_XML_HANDLERS_HAS_DLL 1
+#endif /* ! XSC_XML_HANDLERS_HAS_DLL */
+
+#if defined (XSC_XML_HANDLERS_HAS_DLL) && (XSC_XML_HANDLERS_HAS_DLL == 1)
+#  if defined (XSC_XML_HANDLERS_BUILD_DLL)
+#    define XSC_XML_Handlers_Export ACE_Proper_Export_Flag
+#    define XSC_XML_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define XSC_XML_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* XSC_XML_HANDLERS_BUILD_DLL */
+#    define XSC_XML_Handlers_Export ACE_Proper_Import_Flag
+#    define XSC_XML_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define XSC_XML_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* XSC_XML_HANDLERS_BUILD_DLL */
+#else /* XSC_XML_HANDLERS_HAS_DLL == 1 */
+#  define XSC_XML_Handlers_Export
+#  define XSC_XML_HANDLERS_SINGLETON_DECLARATION(T)
+#  define XSC_XML_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* XSC_XML_HANDLERS_HAS_DLL == 1 */
+
+// Set XSC_XML_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (XSC_XML_HANDLERS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define XSC_XML_HANDLERS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define XSC_XML_HANDLERS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !XSC_XML_HANDLERS_NTRACE */
+
+#if (XSC_XML_HANDLERS_NTRACE == 1)
+#  define XSC_XML_HANDLERS_TRACE(X)
+#else /* (XSC_XML_HANDLERS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define XSC_XML_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (XSC_XML_HANDLERS_NTRACE == 1) */
+
+#endif /* XSC_XML_HANDLERS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/ccd.hpp b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
index 06aeffdc5d0..f4808f1b54d 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef CCD_HPP
 #define CCD_HPP
 
@@ -43,7 +43,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -208,7 +208,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
+      struct XSC_XML_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
       {
         virtual void
         traverse (Type&);
@@ -468,7 +468,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription, 
+      struct XSC_XML_Handlers_Export ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.hpp b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
index 9e8295c7ba2..c85ff0b82e4 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef CDD_HPP
 #define CDD_HPP
 
@@ -47,7 +47,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export Domain : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Domain : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -140,7 +140,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Bridge : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Bridge : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -208,7 +208,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Interconnect : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Interconnect : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -291,7 +291,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export Node : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export Node : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -369,7 +369,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export SharedResource : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SharedResource : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -443,7 +443,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
+      struct XSC_XML_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
       {
         virtual void
         traverse (Type&);
@@ -548,7 +548,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
+      struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
       {
         virtual void
         traverse (Type&);
@@ -641,7 +641,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
+      struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
       {
         virtual void
         traverse (Type&);
@@ -764,7 +764,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
+      struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
       {
         virtual void
         traverse (Type&);
@@ -869,7 +869,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
+      struct XSC_XML_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
       {
         virtual void
         traverse (Type&);
@@ -925,7 +925,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export Domain : Traversal::Domain, 
+      struct XSC_XML_Handlers_Export Domain : Traversal::Domain, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Domain Type;
@@ -1074,7 +1074,7 @@ namespace CIAO
         Domain ();
       };
 
-      struct Config_Handlers_Export Bridge : Traversal::Bridge, 
+      struct XSC_XML_Handlers_Export Bridge : Traversal::Bridge, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Bridge Type;
@@ -1209,7 +1209,7 @@ namespace CIAO
         Bridge ();
       };
 
-      struct Config_Handlers_Export Interconnect : Traversal::Interconnect, 
+      struct XSC_XML_Handlers_Export Interconnect : Traversal::Interconnect, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Interconnect Type;
@@ -1386,7 +1386,7 @@ namespace CIAO
         Interconnect ();
       };
 
-      struct Config_Handlers_Export Node : Traversal::Node, 
+      struct XSC_XML_Handlers_Export Node : Traversal::Node, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Node Type;
@@ -1535,7 +1535,7 @@ namespace CIAO
         Node ();
       };
 
-      struct Config_Handlers_Export SharedResource : Traversal::SharedResource, 
+      struct XSC_XML_Handlers_Export SharedResource : Traversal::SharedResource, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::SharedResource Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index 8f70772abc1..864a4b882d4 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef CDP_HPP
 #define CDP_HPP
 
@@ -43,7 +43,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export DeploymentPlan : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -198,7 +198,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
+      struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
       {
         virtual void
         traverse (Type&);
@@ -440,7 +440,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export DeploymentPlan : Traversal::DeploymentPlan, 
+      struct XSC_XML_Handlers_Export DeploymentPlan : Traversal::DeploymentPlan, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.hpp b/TAO/CIAO/tools/Config_Handlers/cid.hpp
index 671874e2532..4511e56ca87 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef CID_HPP
 #define CID_HPP
 
@@ -52,7 +52,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -131,7 +131,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -169,7 +169,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -217,7 +217,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -276,7 +276,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -330,7 +330,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -476,7 +476,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
+      struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
       {
         virtual void
         traverse (Type&);
@@ -557,7 +557,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
+      struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
       {
         virtual void
         traverse (Type&);
@@ -590,7 +590,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
+      struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
       {
         virtual void
         traverse (Type&);
@@ -629,7 +629,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
+      struct XSC_XML_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
       {
         virtual void
         traverse (Type&);
@@ -710,7 +710,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
+      struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
       {
         virtual void
         traverse (Type&);
@@ -779,7 +779,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
+      struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
       {
         virtual void
         traverse (Type&);
@@ -943,7 +943,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
+      struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
@@ -1050,7 +1050,7 @@ namespace CIAO
         SubcomponentInstantiationDescription ();
       };
 
-      struct Config_Handlers_Export SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
+      struct XSC_XML_Handlers_Export SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
@@ -1101,7 +1101,7 @@ namespace CIAO
         SubcomponentPropertyReference ();
       };
 
-      struct Config_Handlers_Export AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
+      struct XSC_XML_Handlers_Export AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
@@ -1166,7 +1166,7 @@ namespace CIAO
         AssemblyPropertyMapping ();
       };
 
-      struct Config_Handlers_Export ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
+      struct XSC_XML_Handlers_Export ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
@@ -1287,7 +1287,7 @@ namespace CIAO
         ComponentAssemblyDescription ();
       };
 
-      struct Config_Handlers_Export MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
+      struct XSC_XML_Handlers_Export MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
@@ -1380,7 +1380,7 @@ namespace CIAO
         MonolithicImplementationDescription ();
       };
 
-      struct Config_Handlers_Export ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
+      struct XSC_XML_Handlers_Export ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.hpp b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
index d2815a31722..417d718d1c6 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef CPD_HPP
 #define CPD_HPP
 
@@ -46,7 +46,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -86,7 +86,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -209,7 +209,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
+      struct XSC_XML_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
       {
         virtual void
         traverse (Type&);
@@ -242,7 +242,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
+      struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
       {
         virtual void
         traverse (Type&);
@@ -370,7 +370,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export PackagedComponentImplementation : Traversal::PackagedComponentImplementation, 
+      struct XSC_XML_Handlers_Export PackagedComponentImplementation : Traversal::PackagedComponentImplementation, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
@@ -421,7 +421,7 @@ namespace CIAO
         PackagedComponentImplementation ();
       };
 
-      struct Config_Handlers_Export ComponentPackageDescription : Traversal::ComponentPackageDescription, 
+      struct XSC_XML_Handlers_Export ComponentPackageDescription : Traversal::ComponentPackageDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/iad.hpp b/TAO/CIAO/tools/Config_Handlers/iad.hpp
index 5a1132ecfac..987cdfb28d4 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef IAD_HPP
 #define IAD_HPP
 
@@ -44,7 +44,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -82,7 +82,7 @@ namespace CIAO
     };
 
 
-    class Config_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -218,7 +218,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
+      struct XSC_XML_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
       {
         virtual void
         traverse (Type&);
@@ -251,7 +251,7 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct Config_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
+      struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
       {
         virtual void
         traverse (Type&);
@@ -427,7 +427,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export NamedImplementationArtifact : Traversal::NamedImplementationArtifact, 
+      struct XSC_XML_Handlers_Export NamedImplementationArtifact : Traversal::NamedImplementationArtifact, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
@@ -478,7 +478,7 @@ namespace CIAO
         NamedImplementationArtifact ();
       };
 
-      struct Config_Handlers_Export ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
+      struct XSC_XML_Handlers_Export ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/pcd.hpp b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
index 60e159d8b6e..6cc3357cb0c 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef PCD_HPP
 #define PCD_HPP
 
@@ -45,7 +45,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export PackageConfiguration : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export PackageConfiguration : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -150,7 +150,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
+      struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
       {
         virtual void
         traverse (Type&);
@@ -266,7 +266,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export PackageConfiguration : Traversal::PackageConfiguration, 
+      struct XSC_XML_Handlers_Export PackageConfiguration : Traversal::PackageConfiguration, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
index c8406b38321..a62131bf19b 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -19,7 +19,7 @@
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
 #ifndef TOPLEVEL_HPP
 #define TOPLEVEL_HPP
 
@@ -43,7 +43,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
@@ -93,7 +93,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct Config_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
+      struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
       {
         virtual void
         traverse (Type&);
@@ -149,7 +149,7 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct Config_Handlers_Export TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
+      struct XSC_XML_Handlers_Export TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;