summaryrefslogtreecommitdiff
path: root/TAO/CIAO/DAnCE/Config_Handlers
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/DAnCE/Config_Handlers')
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h13
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h4
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h4
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc46
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h1
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Deployment.h17
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h4
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h4
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h12
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h4
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h6
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Utils.h2
32 files changed, 69 insertions, 88 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
index a8d31ea54f1..6c7089915b6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
@@ -11,7 +11,7 @@
#ifndef BASIC_HANDLER_H
#define BASIC_HANDLER_H
-#include "Config.h"
+#include "Deployment.h"
#include "ace/SString.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
index 515a59d70c2..1e867628279 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
@@ -11,17 +11,18 @@
#define CAD_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
+
+#include "Basic_Handler.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
#include "ace/Auto_Ptr.h"
#include "ace/Log_Msg.h"
#include "ace/OS_main.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
index 18eabeff80e..3d1fb12b00b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
@@ -11,13 +11,13 @@
#define CEPE_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOM.hpp>
#include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
index 2c34055e08e..2eaa7b6a216 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
@@ -12,7 +12,7 @@
#define CPK_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
index 8e9c8132f17..4d56f71a3ca 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
@@ -11,13 +11,13 @@
#define CPR_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "Config_Handler_export.h"
#include "ace/SString.h"
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOM.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
index f680961f75d..2abfcf09deb 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
@@ -12,7 +12,7 @@
#define CAP_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
#include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
index 7c4e2e22898..7932ebd4b30 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
@@ -4,7 +4,7 @@
#define COMPINTRDESC_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
#include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
index 9cd81ffa5f5..202afca9b2c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
@@ -12,7 +12,7 @@
#define COMPPKGDESC_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
index ba1b8b5514c..4c039938d90 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
@@ -42,7 +42,7 @@ namespace CIAO
};
- }
+ };
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index 12ab9879d79..d8b0271f991 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -2,14 +2,13 @@
project (Config_Handlers) : ciao_deployment_stub {
- after += CIAO_DnC_Server
sharedname = Config_Handlers
dynamicflags = CONFIG_HANDLER_BUILD_DLL
macros += XML_USE_PTHREADS
requires += exceptions
- includes += $(XERCESCROOT)/include
- libpaths += $(XERCESCROOT)/lib
- libs += xerces-c CIAO_DnC_Server TAO_IFR_Client TAO_Valuetype
+ includes += /usr/include $(XERCESCROOT)/include
+ libpaths += /usr/lib $(XERCESCROOT)/lib
+ libs += xerces-c CIAO_DnC_Server TAO_IFR_Client
Source_Files {
Utils.cpp
@@ -47,42 +46,3 @@ project (Config_Handlers) : ciao_deployment_stub {
XercesString.cpp
}
}
-
-project (XSC_Config_Handlers) : ciao_deployment_stub {
-
- requires += dummy_label
-
- sharedname = XSC_Config_Handlers
- dynamicflags = CONFIG_HANDLER_BUILD_DLL
- macros += XML_USE_PTHREADS
- requires += exceptions
- includes += $(XERCESCROOT)/include .
- libpaths += $(XERCESCROOT)/lib
- libs += xerces-c CIAO_DnC_Server TAO_IFR_Client
-
- Source_Files {
- Basic_Deployment_Data.cpp
- ccd.cpp
- cdd.cpp
- cdp.cpp
- cid.cpp
- cpd.cpp
- Deployment.cpp
- iad.cpp
- pcd.cpp
- toplevel.cpp
- }
-
- Header_Files {
- Basic_Deployment_Data.hpp
- ccd.hpp
- cdd.hpp
- cdp.hpp
- cid.hpp
- cpd.hpp
- Deployment.hpp
- iad.hpp
- pcd.hpp
- toplevel.hpp
- }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
index 8cd04c66650..faac487e828 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
@@ -12,6 +12,7 @@
#define DT_HANDLER_H
#include /**/ "ace/pre.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "tao/ORB.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h
new file mode 100644
index 00000000000..a3fc3b72004
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h
@@ -0,0 +1,17 @@
+//==================================================================
+/**
+ * @file Deployment.h
+ *
+ * $Id$
+ *
+ * @author Emre Turkay <emre.turkay@vanderbilt.edu>
+ */
+//=====================================================================
+
+#ifndef DEPLOYMENT_H
+#define DEPLOYMENT_H
+
+#define BEGIN_DEPLOYMENT_NAMESPACE namespace CIAO { namespace Config_Handler {
+#define END_DEPLOYMENT_NAMESPACE }; };
+
+#endif // DEPLOYMENT_H
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
index b20b98469e9..47d7899432b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
@@ -37,8 +37,8 @@ namespace Deployment
public:
/// Dump functions for CORBA sequences
- static void dump (const char* caption,
- const ::CORBA::StringSeq &str_seq);
+ static void DnC_Dump::dump (const char* caption,
+ const ::CORBA::StringSeq &str_seq);
template <typename SEQUENCE>
static void dump_sequence (const char* caption, const SEQUENCE &seq);
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
index 327bfe54bba..a29e7cf7fd1 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
@@ -11,7 +11,7 @@
#define DOMAIN_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "Basic_Handler.h"
#include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
index 272bd8ecc63..3fdafe87009 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
@@ -13,13 +13,13 @@
#define ERE_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOM.hpp>
#include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
index 8cbfabd510e..a46de1d885f 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
@@ -12,7 +12,7 @@
#define IAD_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
#include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
index c2142cfb706..ef7f9c5c86d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
@@ -12,7 +12,7 @@
#define ID_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
index d7ff20f1c99..9e159ed2636 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
@@ -12,7 +12,7 @@
#define IR_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "Basic_Handler.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
index 4c99ef81621..17c3a2c4a3d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
@@ -4,7 +4,7 @@
#define MID_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
#include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
index cc3b1fd2a11..38ad44beed2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
@@ -12,7 +12,7 @@
#define NIA_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "Basic_Handler.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
index 95cefcf5a90..841db0fc0a6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
@@ -12,7 +12,7 @@
#define PCI_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
index 9dfa24dd354..224f298f0a4 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
@@ -12,7 +12,7 @@
#define PC_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "Basic_Handler.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
index c4994e4255d..3983e4f1faf 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
@@ -11,17 +11,17 @@
#define PLAN_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
+#include "DeploymentC.h"
#include "Basic_Handler.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/Null_Mutex.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Auto_Ptr.h"
#include "ace/Log_Msg.h"
#include "ace/OS_main.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
index bec9e523fe4..c60c1e14b75 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
@@ -12,8 +12,8 @@
#ifndef PROCESS_ELEMENT_H
#define PROCESS_ELEMENT_H
-#include "ciao/DeploymentC.h"
-#include "Config.h"
+#include "DeploymentC.h"
+#include "Deployment.h"
#include "Basic_Handler.h"
#include "Config_Handler_export.h"
#include "ace/SString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
index 1e392aea185..3367a2e1348 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
@@ -10,14 +10,16 @@
#ifndef PROPERTY_HANDLER_H
#define PROPERTY_HANDLER_H
-#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include /**/ "ace/pre.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
+
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOM.hpp>
#include "XercesString.h"
+
using Config_Handler::XStr;
using xercesc::XMLString;
using xercesc::DOMText;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
index dff3a6e149d..11d858b4141 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
@@ -12,7 +12,7 @@
#define RS_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
index b988eead549..70536e39072 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
@@ -12,7 +12,7 @@
#define RUK_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
index c01ead11cab..b960e9b70d7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
@@ -12,7 +12,7 @@
#define REQUIREMENT_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
index 7a9caa3c2a0..51b6f1eb8b2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
@@ -12,7 +12,7 @@
#define SPK_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
index a45dcf7d508..a5402097793 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
@@ -12,7 +12,7 @@
#define SP_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
index 20b7020bd58..30265026f8c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
@@ -12,7 +12,7 @@
#define TPD_HANDLER_H
#include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "Config_Handler_export.h"
#include "Basic_Handler.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
index c47cd4a37c2..dd051603d40 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
#include "Config_Handler_export.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
#include "tao/Basic_Types.h"
#include "XercesString.h"