diff --git a/src/xalanc/DOMSupport/DOMSupportDefault.hpp b/src/xalanc/DOMSupport/DOMSupportDefault.hpp
index d12759b..a77f116 100644
--- a/src/xalanc/DOMSupport/DOMSupportDefault.hpp
+++ b/src/xalanc/DOMSupport/DOMSupportDefault.hpp
@@ -29,7 +29,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(MemoryManager)
+namespace XERCES_CPP_NAMESPACE { class MemoryManager; }
 
 
 
diff --git a/src/xalanc/Include/PlatformDefinitions.hpp b/src/xalanc/Include/PlatformDefinitions.hpp
index 0ec36ad..c841868 100644
--- a/src/xalanc/Include/PlatformDefinitions.hpp
+++ b/src/xalanc/Include/PlatformDefinitions.hpp
@@ -103,14 +103,12 @@
 
 
 #if defined(XERCES_HAS_CPP_NAMESPACE)
-    #define XALAN_DECLARE_XERCES_CLASS(NAME) XALAN_DECLARE_CLASS(XERCES_CPP_NAMESPACE, NAME)
     #define XALAN_DECLARE_XERCES_STRUCT(NAME) XALAN_DECLARE_STRUCT(XERCES_CPP_NAMESPACE, NAME)
 #else
     #define xercesc::
     #define XERCES_CPP_NAMESPACE_BEGIN
     #define XERCES_CPP_NAMESPACE_END
     #define XERCES_CPP_NAMESPACE_USE
-    #define XALAN_DECLARE_XERCES_CLASS(NAME) class NAME;
     #define XALAN_DECLARE_XERCES_STRUCT(NAME) struct NAME;
 #endif
 
diff --git a/src/xalanc/PlatformSupport/ExecutionContext.hpp b/src/xalanc/PlatformSupport/ExecutionContext.hpp
index eec3532..60a13df 100644
--- a/src/xalanc/PlatformSupport/ExecutionContext.hpp
+++ b/src/xalanc/PlatformSupport/ExecutionContext.hpp
@@ -33,7 +33,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/PlatformSupport/ProblemListenerBase.hpp b/src/xalanc/PlatformSupport/ProblemListenerBase.hpp
index 5187f1f..71efbce 100644
--- a/src/xalanc/PlatformSupport/ProblemListenerBase.hpp
+++ b/src/xalanc/PlatformSupport/ProblemListenerBase.hpp
@@ -29,7 +29,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
index beec4d6..e280c52 100644
--- a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
+++ b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
@@ -30,7 +30,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(XMLTranscoder)
+namespace XERCES_CPP_NAMESPACE { class XMLTranscoder; }
 
 
 
diff --git a/src/xalanc/XMLSupport/XMLParserLiaison.hpp b/src/xalanc/XMLSupport/XMLParserLiaison.hpp
index d704046..fd63c45 100644
--- a/src/xalanc/XMLSupport/XMLParserLiaison.hpp
+++ b/src/xalanc/XMLSupport/XMLParserLiaison.hpp
@@ -29,11 +29,11 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(DocumentHandler)
-XALAN_DECLARE_XERCES_CLASS(EntityResolver)
-XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
-XALAN_DECLARE_XERCES_CLASS(InputSource)
-XALAN_DECLARE_XERCES_CLASS(XMLEntityResolver)
+namespace XERCES_CPP_NAMESPACE { class DocumentHandler; }
+namespace XERCES_CPP_NAMESPACE { class EntityResolver; }
+namespace XERCES_CPP_NAMESPACE { class ErrorHandler; }
+namespace XERCES_CPP_NAMESPACE { class InputSource; }
+namespace XERCES_CPP_NAMESPACE { class XMLEntityResolver; }
 
 
 
diff --git a/src/xalanc/XPath/Function.hpp b/src/xalanc/XPath/Function.hpp
index 86610f4..506c448 100644
--- a/src/xalanc/XPath/Function.hpp
+++ b/src/xalanc/XPath/Function.hpp
@@ -34,7 +34,7 @@
 #include <xalanc/XPath/XPathExecutionContext.hpp>
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XPath/XPath.hpp b/src/xalanc/XPath/XPath.hpp
index 62e8eca..f602e27 100644
--- a/src/xalanc/XPath/XPath.hpp
+++ b/src/xalanc/XPath/XPath.hpp
@@ -45,7 +45,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XPath/XPathConstructionContext.hpp b/src/xalanc/XPath/XPathConstructionContext.hpp
index bd43eb1..0fc70e8 100644
--- a/src/xalanc/XPath/XPathConstructionContext.hpp
+++ b/src/xalanc/XPath/XPathConstructionContext.hpp
@@ -33,7 +33,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XPath/XPathEnvSupport.hpp b/src/xalanc/XPath/XPathEnvSupport.hpp
index d84fa6c..8b06797 100644
--- a/src/xalanc/XPath/XPathEnvSupport.hpp
+++ b/src/xalanc/XPath/XPathEnvSupport.hpp
@@ -33,7 +33,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XPath/XPathExecutionContext.hpp b/src/xalanc/XPath/XPathExecutionContext.hpp
index e55dede..93b2b9b 100644
--- a/src/xalanc/XPath/XPathExecutionContext.hpp
+++ b/src/xalanc/XPath/XPathExecutionContext.hpp
@@ -46,7 +46,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
+namespace XERCES_CPP_NAMESPACE { class ErrorHandler; }
 
 
 
diff --git a/src/xalanc/XPath/XPathProcessor.hpp b/src/xalanc/XPath/XPathProcessor.hpp
index e72d807..9a45776 100644
--- a/src/xalanc/XPath/XPathProcessor.hpp
+++ b/src/xalanc/XPath/XPathProcessor.hpp
@@ -31,7 +31,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XPath/XalanQNameByValue.hpp b/src/xalanc/XPath/XalanQNameByValue.hpp
index a546488..d2e88fc 100644
--- a/src/xalanc/XPath/XalanQNameByValue.hpp
+++ b/src/xalanc/XPath/XalanQNameByValue.hpp
@@ -30,7 +30,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XSLT/AVT.hpp b/src/xalanc/XSLT/AVT.hpp
index 43b54fc..975e7f1 100644
--- a/src/xalanc/XSLT/AVT.hpp
+++ b/src/xalanc/XSLT/AVT.hpp
@@ -27,7 +27,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XSLT/ElemTemplateElement.hpp b/src/xalanc/XSLT/ElemTemplateElement.hpp
index 588691e..7e959ab 100644
--- a/src/xalanc/XSLT/ElemTemplateElement.hpp
+++ b/src/xalanc/XSLT/ElemTemplateElement.hpp
@@ -48,8 +48,8 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(AttributeList)
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class AttributeList; }
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XSLT/GenerateEvent.hpp b/src/xalanc/XSLT/GenerateEvent.hpp
index 3125ea2..f8d6a57 100644
--- a/src/xalanc/XSLT/GenerateEvent.hpp
+++ b/src/xalanc/XSLT/GenerateEvent.hpp
@@ -29,7 +29,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(AttributeList)
+namespace XERCES_CPP_NAMESPACE { class AttributeList; }
 
 
 
diff --git a/src/xalanc/XSLT/ProblemListenerDefault.hpp b/src/xalanc/XSLT/ProblemListenerDefault.hpp
index bd0c8e4..f6ccca0 100644
--- a/src/xalanc/XSLT/ProblemListenerDefault.hpp
+++ b/src/xalanc/XSLT/ProblemListenerDefault.hpp
@@ -30,7 +30,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(MemoryManager)
+namespace XERCES_CPP_NAMESPACE { class MemoryManager; }
 
 
 
diff --git a/src/xalanc/XSLT/StylesheetConstructionContext.hpp b/src/xalanc/XSLT/StylesheetConstructionContext.hpp
index 2412be8..e27bfa8 100644
--- a/src/xalanc/XSLT/StylesheetConstructionContext.hpp
+++ b/src/xalanc/XSLT/StylesheetConstructionContext.hpp
@@ -39,9 +39,9 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(AttributeList)
-XALAN_DECLARE_XERCES_CLASS(DocumentHandler)
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class AttributeList; }
+namespace XERCES_CPP_NAMESPACE { class DocumentHandler; }
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XSLT/XSLTEngineImpl.hpp b/src/xalanc/XSLT/XSLTEngineImpl.hpp
index 6218fe0..38e8abf 100644
--- a/src/xalanc/XSLT/XSLTEngineImpl.hpp
+++ b/src/xalanc/XSLT/XSLTEngineImpl.hpp
@@ -78,8 +78,8 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(InputSource)
-XALAN_DECLARE_XERCES_CLASS(DocumentHandler)
+namespace XERCES_CPP_NAMESPACE { class InputSource; }
+namespace XERCES_CPP_NAMESPACE { class DocumentHandler; }
 
 
 
diff --git a/src/xalanc/XSLT/XSLTInputSource.hpp b/src/xalanc/XSLT/XSLTInputSource.hpp
index acee3cf..981a25c 100644
--- a/src/xalanc/XSLT/XSLTInputSource.hpp
+++ b/src/xalanc/XSLT/XSLTInputSource.hpp
@@ -42,7 +42,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XSLT/XSLTProcessor.hpp b/src/xalanc/XSLT/XSLTProcessor.hpp
index 3e0f68d..ec695af 100644
--- a/src/xalanc/XSLT/XSLTProcessor.hpp
+++ b/src/xalanc/XSLT/XSLTProcessor.hpp
@@ -34,7 +34,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
index 385dbd4..6ef1989 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
@@ -40,12 +40,12 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Attributes)
-XALAN_DECLARE_XERCES_CLASS(AttributeList)
-XALAN_DECLARE_XERCES_CLASS(ContentHandler)
-XALAN_DECLARE_XERCES_CLASS(DTDHandler)
-XALAN_DECLARE_XERCES_CLASS(LexicalHandler)
-XALAN_DECLARE_XERCES_CLASS(Locator)
+namespace XERCES_CPP_NAMESPACE { class Attributes; }
+namespace XERCES_CPP_NAMESPACE { class AttributeList; }
+namespace XERCES_CPP_NAMESPACE { class ContentHandler; }
+namespace XERCES_CPP_NAMESPACE { class DTDHandler; }
+namespace XERCES_CPP_NAMESPACE { class LexicalHandler; }
+namespace XERCES_CPP_NAMESPACE { class Locator; }
 
 
 
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
index 8bbdd33..cc02f47 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
@@ -53,8 +53,8 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(Attributes)
-XALAN_DECLARE_XERCES_CLASS(AttributeList)
+namespace XERCES_CPP_NAMESPACE { class Attributes; }
+namespace XERCES_CPP_NAMESPACE { class AttributeList; }
 
 
 
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
index 7504b8a..dc06d38 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
@@ -33,10 +33,10 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(ContentHandler)
-XALAN_DECLARE_XERCES_CLASS(DTDHandler)
-XALAN_DECLARE_XERCES_CLASS(LexicalHandler)
-XALAN_DECLARE_XERCES_CLASS(SAX2XMLReaderImpl)
+namespace XERCES_CPP_NAMESPACE { class ContentHandler; }
+namespace XERCES_CPP_NAMESPACE { class DTDHandler; }
+namespace XERCES_CPP_NAMESPACE { class LexicalHandler; }
+namespace XERCES_CPP_NAMESPACE { class SAX2XMLReaderImpl; }
 
 
 
diff --git a/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp b/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
index b02d13e..5ddce1d 100644
--- a/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
+++ b/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
@@ -42,8 +42,8 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(EntityResolver)
-XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
+namespace XERCES_CPP_NAMESPACE { class EntityResolver; }
+namespace XERCES_CPP_NAMESPACE { class ErrorHandler; }
 
 
 
diff --git a/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp b/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
index 980a679..3086786 100644
--- a/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
+++ b/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
@@ -32,9 +32,9 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(ContentHandler)
-XALAN_DECLARE_XERCES_CLASS(DTDHandler)
-XALAN_DECLARE_XERCES_CLASS(LexicalHandler)
+namespace XERCES_CPP_NAMESPACE { class ContentHandler; }
+namespace XERCES_CPP_NAMESPACE { class DTDHandler; }
+namespace XERCES_CPP_NAMESPACE { class LexicalHandler; }
 
 
 
diff --git a/src/xalanc/XalanTransformer/XalanTransformer.hpp b/src/xalanc/XalanTransformer/XalanTransformer.hpp
index 3ef2506..6660d06 100644
--- a/src/xalanc/XalanTransformer/XalanTransformer.hpp
+++ b/src/xalanc/XalanTransformer/XalanTransformer.hpp
@@ -50,9 +50,9 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(EntityResolver)
-XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
-XALAN_DECLARE_XERCES_CLASS(XMLEntityResolver)
+namespace XERCES_CPP_NAMESPACE { class EntityResolver; }
+namespace XERCES_CPP_NAMESPACE { class ErrorHandler; }
+namespace XERCES_CPP_NAMESPACE { class XMLEntityResolver; }
 
 
 
diff --git a/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp b/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
index 6b50b6a..2e6c800 100644
--- a/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
+++ b/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
@@ -33,8 +33,8 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(DOM_Document)
-XALAN_DECLARE_XERCES_CLASS(DOMDocument)
+namespace XERCES_CPP_NAMESPACE { class DOM_Document; }
+namespace XERCES_CPP_NAMESPACE { class DOMDocument; }
 
 
 
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeHelper.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeHelper.hpp
index 5abaedd..70b761d 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeHelper.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeHelper.hpp
@@ -45,7 +45,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(DOM_CharacterData)
+namespace XERCES_CPP_NAMESPACE { class DOM_CharacterData; }
 
 
 
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
index b06ea96..7d26a9c 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
@@ -24,31 +24,31 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(DOM_Attr)
-XALAN_DECLARE_XERCES_CLASS(DOM_CharacterData)
-XALAN_DECLARE_XERCES_CLASS(DOM_Comment)
-XALAN_DECLARE_XERCES_CLASS(DOM_CDATASection)
-XALAN_DECLARE_XERCES_CLASS(DOM_Document)
-XALAN_DECLARE_XERCES_CLASS(DOM_DocumentFragment)
-XALAN_DECLARE_XERCES_CLASS(DOM_DocumentType)
-XALAN_DECLARE_XERCES_CLASS(DOM_DOMImplementation)
-XALAN_DECLARE_XERCES_CLASS(DOM_Element)
-XALAN_DECLARE_XERCES_CLASS(DOM_Entity)
-XALAN_DECLARE_XERCES_CLASS(DOM_EntityReference)
-XALAN_DECLARE_XERCES_CLASS(DOM_Node)
-XALAN_DECLARE_XERCES_CLASS(DOM_Text)
-XALAN_DECLARE_XERCES_CLASS(DOM_NamedNodeMap)
-XALAN_DECLARE_XERCES_CLASS(DOM_NodeList)
-XALAN_DECLARE_XERCES_CLASS(DOM_Notation)
-XALAN_DECLARE_XERCES_CLASS(DOM_ProcessingInstruction)
-XALAN_DECLARE_XERCES_CLASS(DOM_Text)
-XALAN_DECLARE_XERCES_CLASS(DOM_DocumentType)
-XALAN_DECLARE_XERCES_CLASS(DOM_DOMException)
-XALAN_DECLARE_XERCES_CLASS(DOMString)
-XALAN_DECLARE_XERCES_CLASS(AttrImpl)
-XALAN_DECLARE_XERCES_CLASS(ElementImpl)
-XALAN_DECLARE_XERCES_CLASS(NodeImpl)
-XALAN_DECLARE_XERCES_CLASS(TextImpl)
+namespace XERCES_CPP_NAMESPACE { class DOM_Attr; }
+namespace XERCES_CPP_NAMESPACE { class DOM_CharacterData; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Comment; }
+namespace XERCES_CPP_NAMESPACE { class DOM_CDATASection; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Document; }
+namespace XERCES_CPP_NAMESPACE { class DOM_DocumentFragment; }
+namespace XERCES_CPP_NAMESPACE { class DOM_DocumentType; }
+namespace XERCES_CPP_NAMESPACE { class DOM_DOMImplementation; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Element; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Entity; }
+namespace XERCES_CPP_NAMESPACE { class DOM_EntityReference; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Node; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Text; }
+namespace XERCES_CPP_NAMESPACE { class DOM_NamedNodeMap; }
+namespace XERCES_CPP_NAMESPACE { class DOM_NodeList; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Notation; }
+namespace XERCES_CPP_NAMESPACE { class DOM_ProcessingInstruction; }
+namespace XERCES_CPP_NAMESPACE { class DOM_Text; }
+namespace XERCES_CPP_NAMESPACE { class DOM_DocumentType; }
+namespace XERCES_CPP_NAMESPACE { class DOM_DOMException; }
+namespace XERCES_CPP_NAMESPACE { class DOMString; }
+namespace XERCES_CPP_NAMESPACE { class AttrImpl; }
+namespace XERCES_CPP_NAMESPACE { class ElementImpl; }
+namespace XERCES_CPP_NAMESPACE { class NodeImpl; }
+namespace XERCES_CPP_NAMESPACE { class TextImpl; }
 
 
 
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
index 9fe8d61..3728f4b 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
@@ -40,7 +40,7 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(NodeImpl)
+namespace XERCES_CPP_NAMESPACE { class NodeImpl; }
 
 
 
diff --git a/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp b/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
index 190b73c..fe88e12 100644
--- a/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
@@ -47,11 +47,11 @@
 
 
 #if XERCES_VERSION_MAJOR >= 2
-XALAN_DECLARE_XERCES_CLASS(XercesDOMParser)
+namespace XERCES_CPP_NAMESPACE { class XercesDOMParser; }
 #else
-XALAN_DECLARE_XERCES_CLASS(DOMParser)
+namespace XERCES_CPP_NAMESPACE { class DOMParser; }
 #endif
-XALAN_DECLARE_XERCES_CLASS(SAXParser)
+namespace XERCES_CPP_NAMESPACE { class SAXParser; }
 
 
 
diff --git a/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp b/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
index 66826ba..8af097a 100644
--- a/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
@@ -24,25 +24,25 @@
 
 
 
-XALAN_DECLARE_XERCES_CLASS(DOMAttr)
-XALAN_DECLARE_XERCES_CLASS(DOMCharacterData)
-XALAN_DECLARE_XERCES_CLASS(DOMComment)
-XALAN_DECLARE_XERCES_CLASS(DOMCDATASection)
-XALAN_DECLARE_XERCES_CLASS(DOMDocument)
-XALAN_DECLARE_XERCES_CLASS(DOMDocumentFragment)
-XALAN_DECLARE_XERCES_CLASS(DOMImplementation)
-XALAN_DECLARE_XERCES_CLASS(DOMElement)
-XALAN_DECLARE_XERCES_CLASS(DOMEntity)
-XALAN_DECLARE_XERCES_CLASS(DOMEntityReference)
-XALAN_DECLARE_XERCES_CLASS(DOMNode)
-XALAN_DECLARE_XERCES_CLASS(DOMText)
-XALAN_DECLARE_XERCES_CLASS(DOMNamedNodeMap)
-XALAN_DECLARE_XERCES_CLASS(DOMNodeList)
-XALAN_DECLARE_XERCES_CLASS(DOMNotation)
-XALAN_DECLARE_XERCES_CLASS(DOMProcessingInstruction)
-XALAN_DECLARE_XERCES_CLASS(DOMText)
-XALAN_DECLARE_XERCES_CLASS(DOMDocumentType)
-XALAN_DECLARE_XERCES_CLASS(DOMException)
+namespace XERCES_CPP_NAMESPACE { class DOMAttr; }
+namespace XERCES_CPP_NAMESPACE { class DOMCharacterData; }
+namespace XERCES_CPP_NAMESPACE { class DOMComment; }
+namespace XERCES_CPP_NAMESPACE { class DOMCDATASection; }
+namespace XERCES_CPP_NAMESPACE { class DOMDocument; }
+namespace XERCES_CPP_NAMESPACE { class DOMDocumentFragment; }
+namespace XERCES_CPP_NAMESPACE { class DOMImplementation; }
+namespace XERCES_CPP_NAMESPACE { class DOMElement; }
+namespace XERCES_CPP_NAMESPACE { class DOMEntity; }
+namespace XERCES_CPP_NAMESPACE { class DOMEntityReference; }
+namespace XERCES_CPP_NAMESPACE { class DOMNode; }
+namespace XERCES_CPP_NAMESPACE { class DOMText; }
+namespace XERCES_CPP_NAMESPACE { class DOMNamedNodeMap; }
+namespace XERCES_CPP_NAMESPACE { class DOMNodeList; }
+namespace XERCES_CPP_NAMESPACE { class DOMNotation; }
+namespace XERCES_CPP_NAMESPACE { class DOMProcessingInstruction; }
+namespace XERCES_CPP_NAMESPACE { class DOMText; }
+namespace XERCES_CPP_NAMESPACE { class DOMDocumentType; }
+namespace XERCES_CPP_NAMESPACE { class DOMException; }