diff --git a/tools/IANACharset/IANACharset_ErrHandler.hpp b/tools/IANACharset/IANACharset_ErrHandler.hpp
index deceb72fdfa914b3c2407e721b250eb287aa7a9a..56215e1cc554dfab07d600db1ce5eacc2b8b9728 100644
--- a/tools/IANACharset/IANACharset_ErrHandler.hpp
+++ b/tools/IANACharset/IANACharset_ErrHandler.hpp
@@ -1,37 +1,37 @@
 /*
  * The Apache Software License, Version 1.1
- * 
+ *
  * Copyright (c) 2002 The Apache Software Foundation.  All rights
  * reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- * 
+ *    notice, this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 
+ *
  * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
+ *    if any, must include the following acknowledgment:
  *       "This product includes software developed by the
  *        Apache Software Foundation (http://www.apache.org/)."
  *    Alternately, this acknowledgment may appear in the software itself,
  *    if and wherever such third-party acknowledgments normally appear.
- * 
+ *
  * 4. The names "Xerces" and "Apache Software Foundation" must
  *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
+ *    software without prior written permission. For written
  *    permission, please contact apache\@apache.org.
- * 
+ *
  * 5. Products derived from this software may not be called "Apache",
  *    nor may "Apache" appear in their name, without prior written
  *    permission of the Apache Software Foundation.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * ====================================================================
- * 
+ *
  * This software consists of voluntary contributions made by many
  * individuals on behalf of the Apache Software Foundation, and was
  * originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.2  2002/11/05 22:14:31  tng
+ * Explicit code using namespace in application.
+ *
  * Revision 1.1  2002/07/18 20:15:32  knoaman
  * Initial checkin: feature to control strict IANA encoding name.
  *
@@ -64,6 +67,8 @@
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/sax/ErrorHandler.hpp>
 
+XERCES_CPP_NAMESPACE_USE
+
 class IANACharsetErrHandler : public ErrorHandler
 {
 public:
@@ -76,7 +81,7 @@ public:
 
     ~IANACharsetErrHandler()
     {
-    } 
+    }
 
 
     // -----------------------------------------------------------------------
diff --git a/tools/NLS/Xlat/Xlat.hpp b/tools/NLS/Xlat/Xlat.hpp
index 0c78ebb133c1a0ca52e5be94a2cf2cc8a2476ce9..761c42b0f76c16fb3f62426f9ab9ecffdf4bdb24 100644
--- a/tools/NLS/Xlat/Xlat.hpp
+++ b/tools/NLS/Xlat/Xlat.hpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.8  2002/11/05 22:10:06  tng
+ * Explicit code using namespace in application.
+ *
  * Revision 1.7  2002/09/30 22:09:58  peiyongz
  * To generate icu resource file (in text) for error message.
  *
@@ -86,7 +89,6 @@
  *
  */
 
-
 // ---------------------------------------------------------------------------
 //  Some globally used types
 // ---------------------------------------------------------------------------
@@ -119,6 +121,8 @@ enum MsgTypes
 #include "Xlat_MsgCatalog.hpp"
 #include "Xlat_ICUResourceBundle.hpp"
 
+XERCES_CPP_NAMESPACE_USE
+
 
 // ---------------------------------------------------------------------------
 //  Some const global data
diff --git a/tools/NLS/Xlat/Xlat_ErrHandler.hpp b/tools/NLS/Xlat/Xlat_ErrHandler.hpp
index 9d938ba3ae61c8ce3d56efe615634a9de3219b16..4da72f739e5b9395a9b85af637835ce82735fc97 100644
--- a/tools/NLS/Xlat/Xlat_ErrHandler.hpp
+++ b/tools/NLS/Xlat/Xlat_ErrHandler.hpp
@@ -1,37 +1,37 @@
 /*
  * The Apache Software License, Version 1.1
- * 
+ *
  * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
  * reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- * 
+ *    notice, this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 
+ *
  * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
+ *    if any, must include the following acknowledgment:
  *       "This product includes software developed by the
  *        Apache Software Foundation (http://www.apache.org/)."
  *    Alternately, this acknowledgment may appear in the software itself,
  *    if and wherever such third-party acknowledgments normally appear.
- * 
+ *
  * 4. The names "Xerces" and "Apache Software Foundation" must
  *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
+ *    software without prior written permission. For written
  *    permission, please contact apache\@apache.org.
- * 
+ *
  * 5. Products derived from this software may not be called "Apache",
  *    nor may "Apache" appear in their name, without prior written
  *    permission of the Apache Software Foundation.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * ====================================================================
- * 
+ *
  * This software consists of voluntary contributions made by many
  * individuals on behalf of the Apache Software Foundation, and was
  * originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.5  2002/11/05 22:10:06  tng
+ * Explicit code using namespace in application.
+ *
  * Revision 1.4  2002/02/01 23:48:37  peiyongz
  * sane_include
  *
@@ -78,6 +81,8 @@
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/sax/ErrorHandler.hpp>
 
+XERCES_CPP_NAMESPACE_USE
+
 class XlatErrHandler : public ErrorHandler
 {
 public:
@@ -90,7 +95,7 @@ public:
 
     ~XlatErrHandler()
     {
-    } 
+    }
 
 
     // -----------------------------------------------------------------------