diff --git a/src/xercesc/util/EncodingValidator.cpp b/src/xercesc/util/EncodingValidator.cpp
index 329aeb97e779f7a773b5d81ac83f76e9bac5def6..2fad0e43b88edd3f6de0b3c9977bfc6028883330 100644
--- a/src/xercesc/util/EncodingValidator.cpp
+++ b/src/xercesc/util/EncodingValidator.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.5  2004/01/13 16:17:10  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.4  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -170,7 +173,7 @@ EncodingValidator* EncodingValidator::instance()
         if (!fInstance)
         { 
             fInstance = new EncodingValidator();
-            instanceCleanup.registerCleanup(reinitInstance);
+            instanceCleanup.registerCleanup(EncodingValidator::reinitInstance);
         }
     }
 
diff --git a/src/xercesc/util/regx/RangeTokenMap.cpp b/src/xercesc/util/regx/RangeTokenMap.cpp
index 0196f72cfbe93d8446fb69e7ed5bec62c3426907..550c2d60b9a64f2073a7741f08ef51e950c3b0c5 100644
--- a/src/xercesc/util/regx/RangeTokenMap.cpp
+++ b/src/xercesc/util/regx/RangeTokenMap.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.9  2004/01/13 16:17:10  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.8  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -346,7 +349,7 @@ RangeTokenMap* RangeTokenMap::instance()
         if (!fInstance)
         {
             fInstance = new RangeTokenMap();
-            rangeTokMapInstanceCleanup.registerCleanup(reinitInstance);
+            rangeTokMapInstanceCleanup.registerCleanup(RangeTokenMap::reinitInstance);
         }
     }
 
diff --git a/src/xercesc/validators/DTD/DTDGrammar.cpp b/src/xercesc/validators/DTD/DTDGrammar.cpp
index 847f727457537bb841693dccd1837dcb4aff3e57..0980bd8527ca32d7031f7711d65a48094a3c2974 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.cpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.15  2004/01/13 16:17:09  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.14  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -311,7 +314,7 @@ void DTDGrammar::resetEntityDeclPool() {
                 fDefaultEntities->put(new DTDEntityDecl(XMLUni::fgApos, chSingleQuote, true, true));
 
                 // register cleanup method
-                entityPoolRegistryCleanup.registerCleanup(reinitDfltEntities);
+                entityPoolRegistryCleanup.registerCleanup(DTDGrammar::reinitDfltEntities);
                 sEntityPoolMutexRegistered = true;
             }
         }
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
index 1c0f9734e8410cd3426b224553f2085af8fe1b45..2297a1185c56a9515ec723442e49277d92184ad5 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.26  2004/01/13 16:17:09  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.25  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -815,7 +818,7 @@ void DatatypeValidatorFactory::expandRegistryToFullSchemaSet()
                 initCanRepRegistory();
 
                 // register cleanup method
-                builtInRegistryCleanup.registerCleanup(reinitRegistry);
+                builtInRegistryCleanup.registerCleanup(DatatypeValidatorFactory::reinitRegistry);
                 sBuiltInRegistryMutexRegistered = true;
             }
         }
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.cpp b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
index 7772886f75e3e9b0c51210b2b4f4a1d7197860d9..401d256febd5afe50b1fd11d40a64710ddd3c1b1 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.cpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.25  2004/01/13 16:17:09  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.24  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -327,7 +330,7 @@ ComplexTypeInfo* ComplexTypeInfo::getAnyType(unsigned int emptyNSId)
                 fAnyType->setAttWildCard(attWildCard);
 
                 // register cleanup method
-                anyTypeCleanup.registerCleanup(reinitAnyType);
+                anyTypeCleanup.registerCleanup(ComplexTypeInfo::reinitAnyType);
                 sAnyTypeMutexRegistered = true;
             }
         }
diff --git a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
index 5356d616af6e3dd33fbec34a5430e6b76fdfecc1..7730de2d4ec0f8549fd9a6f5a98d89cc2f0f031b 100644
--- a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
+++ b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.20  2004/01/13 16:17:09  knoaman
+ * Fo sanity, use class name to qualify method
+ *
  * Revision 1.19  2004/01/09 22:41:58  knoaman
  * Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
  *
@@ -287,7 +290,7 @@ void GeneralAttributeCheck::mapElements()
                 mapAttributes();
 
                 // register for cleanup at Termination.
-                sGeneralAttCheckCleanup.registerCleanup(reinitGeneralAttCheck);
+                sGeneralAttCheckCleanup.registerCleanup(GeneralAttributeCheck::reinitGeneralAttCheck);
                 sGeneralAttCheckMutexRegistered = true;
             }
         }