2 files changed, 4 insertions, 7 deletions
diff --git a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
index 25dd7736706..6bb7b0f1428 100644
--- a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
+++ b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
@@ -15,7 +15,6 @@
 #include /**/ "ace/pre.h"
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/common/XMLReader.h"
-#include "XML_Helpers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -66,7 +65,7 @@ namespace CIAO
      * @sa ACEXML_DefaultHandler
      * @sa DocHandler_Context
      */
-    class  CIAO_XML_HELPERS_Export Cascadable_DocHandler : public ACEXML_DefaultHandler
+    class Cascadable_DocHandler : public ACEXML_DefaultHandler
     {
     public:
       /**
@@ -203,7 +202,7 @@ namespace CIAO
      *
      * @brief This DocHandler ignore and skip over a specific tag.
      */
-    class CIAO_XML_HELPERS_Export Skip_DocHandler : public Cascadable_DocHandler
+    class Skip_DocHandler : public Cascadable_DocHandler
     {
     public:
       /// Constructor.
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index edfc0116fe2..2fbba07841b 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -7,8 +7,6 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml, ciao_cli
                   -Wb,export_macro=CIAO_XML_HELPERS_Export
   dynamicflags += CIAO_XML_HELPERS_BUILD_DLL
 
-  libs += TAO_Security
-
   IDL_Files {
    RTConfiguration.idl
   }
@@ -24,8 +22,8 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml, ciao_cli
   }
 }
 
-project(Helper_Test): rtcorba, portableserver, acexml, ciao_client , taoserver{
-  libs += CIAO_XML_Helpers 
+project(Helper_Test): rtcorba, taoserver, acexml{
+  libs += CIAO_XML_Helpers CIAO_Client  TAO_IFR_Client
   after += XML_Helpers
 
   IDL_Files {