diff --git a/Projects/Win32/CodeWarrior/XercesLib/XercesLib.mcp.xml b/Projects/Win32/CodeWarrior/XercesLib/XercesLib.mcp.xml
index 116f2ceae8f2fb2720a72c71b408c8a81eb104c7..4f8b721a3c8e2811682e14cc965e8791a45198cd 100644
--- a/Projects/Win32/CodeWarrior/XercesLib/XercesLib.mcp.xml
+++ b/Projects/Win32/CodeWarrior/XercesLib/XercesLib.mcp.xml
@@ -3914,15 +3914,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>..\..\..\..\src\xercesc\util</ACCESSPATH>
-                    <PATH>NoDefTranscoderException.hpp</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>PathRelative</PATHTYPE>
                     <PATHROOT>Project</PATHROOT>
@@ -7649,6 +7640,60 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS>Debug</FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS>Debug</FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS>Debug</FILEFLAGS>
+                </FILE>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>
@@ -9863,13 +9908,6 @@
                     <PATH>NameIdPool.hpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>..\..\..\..\src\xercesc\util</ACCESSPATH>
-                    <PATH>NoDefTranscoderException.hpp</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>PathRelative</PATHTYPE>
                     <PATHROOT>Project</PATHROOT>
@@ -12733,13 +12771,6 @@
                     <PATH>DefaultPanicHandler.cpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>CodeWarrior</PATHROOT>
-                    <ACCESSPATH>:Win32-x86 Support:</ACCESSPATH>
-                    <PATH>Libraries\Win32 SDK\advapi32.lib</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>PathRelative</PATHTYPE>
                     <PATHROOT>Project</PATHROOT>
@@ -12768,6 +12799,55 @@
                     <PATH>DOMNormalizer.cpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>CodeWarrior</PATHROOT>
+                    <ACCESSPATH>:Win32-x86 Support:</ACCESSPATH>
+                    <PATH>Libraries\Win32 SDK\advapi32.lib</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
             </LINKORDER>
         </TARGET>
         <TARGET>
@@ -16631,15 +16711,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>..\..\..\..\src\xercesc\util</ACCESSPATH>
-                    <PATH>NoDefTranscoderException.hpp</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>PathRelative</PATHTYPE>
                     <PATHROOT>Project</PATHROOT>
@@ -20366,6 +20437,60 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>
@@ -22580,13 +22705,6 @@
                     <PATH>NameIdPool.hpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>..\..\..\..\src\xercesc\util</ACCESSPATH>
-                    <PATH>NoDefTranscoderException.hpp</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>PathRelative</PATHTYPE>
                     <PATHROOT>Project</PATHROOT>
@@ -25485,6 +25603,48 @@
                     <PATH>XMemory.hpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                    <PATH>XMLDTDDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                    <PATH>XMLSchemaDescriptionImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
             </LINKORDER>
         </TARGET>
     </TARGETLIST>
@@ -28025,6 +28185,22 @@
                     <PATH>MemoryManagerImpl.cpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
+                <FILEREF>
+                    <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.hpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                    <PATHTYPE>PathRelative</PATHTYPE>
+                    <PATHROOT>Project</PATHROOT>
+                    <ACCESSPATH>..\..\..\..\src\xercesc\internal</ACCESSPATH>
+                    <PATH>XMLGrammarPoolImpl.cpp</PATH>
+                    <PATHFORMAT>Windows</PATHFORMAT>
+                </FILEREF>
             </GROUP>
             <GROUP><NAME>parsers</NAME>
                 <FILEREF>
@@ -28601,14 +28777,6 @@
                     <PATH>NameIdPool.hpp</PATH>
                     <PATHFORMAT>Windows</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Xerces DLL Debug</TARGETNAME>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>..\..\..\..\src\xercesc\util</ACCESSPATH>
-                    <PATH>NoDefTranscoderException.hpp</PATH>
-                    <PATHFORMAT>Windows</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <TARGETNAME>Xerces DLL Debug</TARGETNAME>
                     <PATHTYPE>PathRelative</PATHTYPE>
@@ -30804,6 +30972,22 @@
                         <PATH>DTDValidator.hpp</PATH>
                         <PATHFORMAT>Windows</PATHFORMAT>
                     </FILEREF>
+                    <FILEREF>
+                        <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                        <PATHTYPE>PathRelative</PATHTYPE>
+                        <PATHROOT>Project</PATHROOT>
+                        <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                        <PATH>XMLDTDDescriptionImpl.hpp</PATH>
+                        <PATHFORMAT>Windows</PATHFORMAT>
+                    </FILEREF>
+                    <FILEREF>
+                        <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                        <PATHTYPE>PathRelative</PATHTYPE>
+                        <PATHROOT>Project</PATHROOT>
+                        <ACCESSPATH>..\..\..\..\src\xercesc\validators\DTD</ACCESSPATH>
+                        <PATH>XMLDTDDescriptionImpl.cpp</PATH>
+                        <PATHFORMAT>Windows</PATHFORMAT>
+                    </FILEREF>
                 </GROUP>
                 <GROUP><NAME>schema</NAME>
                     <FILEREF>
@@ -31288,6 +31472,22 @@
                         <PATH>XercesGroupInfo.hpp</PATH>
                         <PATHFORMAT>Windows</PATHFORMAT>
                     </FILEREF>
+                    <FILEREF>
+                        <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                        <PATHTYPE>PathRelative</PATHTYPE>
+                        <PATHROOT>Project</PATHROOT>
+                        <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                        <PATH>XMLSchemaDescriptionImpl.cpp</PATH>
+                        <PATHFORMAT>Windows</PATHFORMAT>
+                    </FILEREF>
+                    <FILEREF>
+                        <TARGETNAME>Xerces DLL Debug</TARGETNAME>
+                        <PATHTYPE>PathRelative</PATHTYPE>
+                        <PATHROOT>Project</PATHROOT>
+                        <ACCESSPATH>..\..\..\..\src\xercesc\validators\schema</ACCESSPATH>
+                        <PATH>XMLSchemaDescriptionImpl.hpp</PATH>
+                        <PATHFORMAT>Windows</PATHFORMAT>
+                    </FILEREF>
                     <FILEREF>
                         <TARGETNAME>Xerces DLL Debug</TARGETNAME>
                         <PATHTYPE>PathRelative</PATHTYPE>