diff --git a/src/util/regx/BMPattern.hpp b/src/util/regx/BMPattern.hpp
index 1aad6e409a959c432a715a99cd5aea2f065dd599..c0ab53c418bf5697bde8ef20aefb8db9edf3d34f 100644
--- a/src/util/regx/BMPattern.hpp
+++ b/src/util/regx/BMPattern.hpp
@@ -179,4 +179,5 @@ inline void BMPattern::cleanUp() {
 
 /*
  * End of file BMPattern.hpp
- */
\ No newline at end of file
+ */
+
diff --git a/src/util/regx/RangeFactory.cpp b/src/util/regx/RangeFactory.cpp
index d4e6ef0d7e34da940394ed4dabf53650cb3dad0d..807fbc31c09ae96a31d308e6594a7717af31279f 100644
--- a/src/util/regx/RangeFactory.cpp
+++ b/src/util/regx/RangeFactory.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.2  2001/03/22 13:23:32  knoaman
+ * Minor modifications to eliminate compiler warnings.
+ *
  * Revision 1.1  2001/03/02 19:26:44  knoaman
  * Schema: Regular expression handling part II
  *
@@ -68,6 +71,7 @@
 #include <util/regx/RangeToken.hpp>
 #include <util/PlatformUtils.hpp>
 #include <util/regx/RegxDefs.hpp>
+#include <stdlib.h>
 
 // ---------------------------------------------------------------------------
 //  Static member data initialization
@@ -235,6 +239,21 @@ void RangeFactory::initializeKeywordMap() {
 	// Behavior defined at child level
 }
 
+
+// ---------------------------------------------------------------------------
+//  RangeFactory: Instance methods
+// ---------------------------------------------------------------------------
+RangeFactory* RangeFactory::instance() {
+
+	if (!fInstance) {
+
+		fInstance = new RangeFactory();
+		atexit(RangeFactory::cleanUp);
+	}
+	
+    return (fInstance);
+}
+
 /**
   * End of file RangeFactory.cpp
   */
diff --git a/src/util/regx/RangeFactory.hpp b/src/util/regx/RangeFactory.hpp
index d174de61aa49e5339c543c1dfbe5c2208372eec5..cf1137a293d7c16c5eedd8f51fd5640044ab2f34 100644
--- a/src/util/regx/RangeFactory.hpp
+++ b/src/util/regx/RangeFactory.hpp
@@ -66,7 +66,6 @@
 // ---------------------------------------------------------------------------
 #include <util/StringPool.hpp>
 #include <util/Mutexes.hpp>
-#include <stdlib.h>
 
 // ---------------------------------------------------------------------------
 //  Forward Declaration
@@ -255,20 +254,6 @@ inline XMLStringPool* RangeFactory::getCategories() const {
     return fCategories;
 }
 
-// ---------------------------------------------------------------------------
-//  RangeFactory: Instance methods
-// ---------------------------------------------------------------------------
-inline RangeFactory* RangeFactory::instance() {
-
-	if (!fInstance) {
-
-		fInstance = new RangeFactory();
-		atexit(cleanUp);
-	}
-	
-    return (fInstance);
-}
-
 // ---------------------------------------------------------------------------
 //  RangeFactory: cleanUp methods
 // ---------------------------------------------------------------------------
diff --git a/src/util/regx/RegularExpression.hpp b/src/util/regx/RegularExpression.hpp
index a0693f2c4adc0ed7c5439dbc8eafe2f4ef03036a..3611deac94055a835779db8c533be975f0413dd8 100644
--- a/src/util/regx/RegularExpression.hpp
+++ b/src/util/regx/RegularExpression.hpp
@@ -571,3 +571,4 @@ inline bool RegularExpression::matchIgnoreCase(const XMLInt32 ch1,
 /**
   * End of file RegularExpression.hpp
   */
+
diff --git a/src/util/regx/RegxDefs.hpp b/src/util/regx/RegxDefs.hpp
index 06ad389163419b0abea37ed296e745c3c9483581..2d66d8d92f9f0bbc7b00956b3e0294e95f4cfa58 100644
--- a/src/util/regx/RegxDefs.hpp
+++ b/src/util/regx/RegxDefs.hpp
@@ -265,4 +265,4 @@ const XMLCh fgUniSymbol[] =
 /**
   * End of file RegxDefs.hpp
   */
- 
\ No newline at end of file
+
diff --git a/src/util/regx/RegxParser.hpp b/src/util/regx/RegxParser.hpp
index fee85195a0c044f7d74308ab45df9ca4562ef2fc..562161ccc9c430ca47b9ec213c5f7a50d6a3c822 100644
--- a/src/util/regx/RegxParser.hpp
+++ b/src/util/regx/RegxParser.hpp
@@ -310,4 +310,5 @@ inline int RegxParser::hexChar(const XMLInt32 ch) {
 
 /**
   *	End file RegxParser.hpp
-  */
\ No newline at end of file
+  */
+
diff --git a/src/util/regx/RegxUtil.hpp b/src/util/regx/RegxUtil.hpp
index e55d982b2c37e5578f0f4194e3416205abd2364c..fed0b0ed11b79bd0327b44cb842685f41a7b0e1a 100644
--- a/src/util/regx/RegxUtil.hpp
+++ b/src/util/regx/RegxUtil.hpp
@@ -70,6 +70,11 @@
 class XMLUTIL_EXPORT RegxUtil {
 public:
 
+	// -----------------------------------------------------------------------
+    //  Constructors and destructors
+    // -----------------------------------------------------------------------
+	~RegxUtil() {}
+
 	static XMLInt32 composeFromSurrogate(const XMLCh high, const XMLCh low);
 	static bool isEOLChar(const XMLCh);
 	static bool isWordChar(const XMLCh);
@@ -83,7 +88,6 @@ private:
     //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     RegxUtil();
-	~RegxUtil();
 };
 
 
diff --git a/src/util/regx/TokenFactory.cpp b/src/util/regx/TokenFactory.cpp
index 2ea07434efb276de1b8fdc594674fda9eb629459..162160ec447e0baa286e0e8e7694925c82883191 100644
--- a/src/util/regx/TokenFactory.cpp
+++ b/src/util/regx/TokenFactory.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.2  2001/03/22 13:23:34  knoaman
+ * Minor modifications to eliminate compiler warnings.
+ *
  * Revision 1.1  2001/03/02 19:23:00  knoaman
  * Schema: Regular expression handling part I
  *
@@ -71,6 +74,7 @@
 #include <util/regx/UnicodeRangeFactory.hpp>
 #include <util/regx/BlockRangeFactory.hpp>
 #include <util/regx/RegxDefs.hpp>
+#include <stdlib.h>
 
 // ---------------------------------------------------------------------------
 //  Static member data initialization
@@ -392,6 +396,19 @@ Token* TokenFactory::getGraphemePattern() {
 }
 
 
+// ---------------------------------------------------------------------------
+//  RangeFactory: Instance methods
+// ---------------------------------------------------------------------------
+TokenFactory* TokenFactory::instance() {
+
+    if (!fInstance) {
+
+        fInstance = new TokenFactory();
+        atexit(TokenFactory::cleanUp);
+    }
+	
+    return (fInstance);
+}
 
 
 // ---------------------------------------------------------------------------
diff --git a/src/util/regx/TokenFactory.hpp b/src/util/regx/TokenFactory.hpp
index f745ef2c288702758de6249bb492402e1d2eb71b..26688a6cfac84114d4c50840a54dfdff4b6f26de 100644
--- a/src/util/regx/TokenFactory.hpp
+++ b/src/util/regx/TokenFactory.hpp
@@ -69,7 +69,6 @@
 #include <util/RefVectorOf.hpp>
 #include <util/regx/Token.hpp>
 #include <util/Mutexes.hpp>
-#include <stdlib.h>
 
 // ---------------------------------------------------------------------------
 //  Forward Declaration
@@ -191,20 +190,6 @@ private:
 };
 
 
-// ---------------------------------------------------------------------------
-//  RangeFactory: Instance methods
-// ---------------------------------------------------------------------------
-inline TokenFactory* TokenFactory::instance() {
-
-	if (!fInstance) {
-
-		fInstance = new TokenFactory();
-		atexit(cleanUp);
-	}
-	
-    return (fInstance);
-}
-
 // ---------------------------------------------------------------------------
 //  RangeFactory: Instance methods
 // ---------------------------------------------------------------------------
@@ -219,3 +204,4 @@ inline void TokenFactory::cleanUp() {
 /**
   *	End file TokenFactory
   */
+
diff --git a/src/util/regx/XMLUniCharacter.hpp b/src/util/regx/XMLUniCharacter.hpp
index ab4e4ea5964e2067685851dffd553fdef1ba5348..f980c53c05bcd18c10f0423800b041b360ba9b79 100644
--- a/src/util/regx/XMLUniCharacter.hpp
+++ b/src/util/regx/XMLUniCharacter.hpp
@@ -107,6 +107,8 @@ public:
 		FINAL_PUNCTUATION       = 29
 	};
 
+	/** destructor */
+    ~XMLUniCharacter() {}
 
     /* Static methods for getting unicode character type */
     /** @name Getter functions */
@@ -125,8 +127,6 @@ private :
     //@{
     /** Unimplemented default constructor */
     XMLUniCharacter();
-    /** Unimplemented destructor */
-    ~XMLUniCharacter();
     //@}
 };