diff --git a/mozilla/extensions/transformiix/source/base/MITREObjectWrapper.cpp b/mozilla/extensions/transformiix/source/base/MITREObjectWrapper.cpp
index ee425661509..412ccd4031d 100644
--- a/mozilla/extensions/transformiix/source/base/MITREObjectWrapper.cpp
+++ b/mozilla/extensions/transformiix/source/base/MITREObjectWrapper.cpp
@@ -1,23 +1,3 @@
-/*
- * (C) Copyright The MITRE Corporation 1999  All rights reserved.
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * The program provided "as is" without any warranty express or
- * implied, including the warranty of non-infringement and the implied
- * warranties of merchantibility and fitness for a particular purpose.
- * The Copyright owner will not be liable for any damages suffered by
- * you as a result of using the Program. In no event will the Copyright
- * owner be liable for any special, indirect or consequential damages or
- * lost profits even if the Copyright owner has been advised of the
- * possibility of their occurrence.
- *
- * Please see release.txt distributed with this file for more information.
- *
- */
 /*
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -41,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: MITREObjectWrapper.cpp,v 1.2 1999-11-15 07:12:40 nisheeth%netscape.com Exp $
+ * $Id: MITREObjectWrapper.cpp,v 1.3 2000-02-22 11:09:51 kvisco%ziplink.net Exp $
  */
 
 #include "MITREObject.h"
diff --git a/mozilla/extensions/transformiix/source/base/Makefile b/mozilla/extensions/transformiix/source/base/Makefile
index 308e83f199c..99451b1edec 100644
--- a/mozilla/extensions/transformiix/source/base/Makefile
+++ b/mozilla/extensions/transformiix/source/base/Makefile
@@ -3,7 +3,8 @@ target: make_base
 CC := $(CC) -g
 
 BASE_OBJS = CommandLineUtils.o \
-	    Double.o \
+	        Double.o \
+            HashTable.o \
             Integer.o \
             List.o \
             MITREObjectWrapper.o \
@@ -22,6 +23,9 @@ CommandLineUtils.o: CommandLineUtils.h CommandLineUtils.cpp
 Double.o: primitives.h Double.cpp
 	$(CC) -c Double.cpp
 
+HashTable.o: HashTable.h HashTable.cpp
+	$(CC) -c HashTable.cpp
+
 Integer.o: primitives.h Integer.cpp
 	$(CC) -c Integer.cpp
 
diff --git a/mozilla/extensions/transformiix/source/base/NamedMap.h b/mozilla/extensions/transformiix/source/base/NamedMap.h
index b565e598009..c67e6ee6eed 100644
--- a/mozilla/extensions/transformiix/source/base/NamedMap.h
+++ b/mozilla/extensions/transformiix/source/base/NamedMap.h
@@ -21,17 +21,17 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: NamedMap.h,v 1.2 1999-11-15 07:12:41 nisheeth%netscape.com Exp $
+ * $Id: NamedMap.h,v 1.3 2000-02-22 11:10:00 kvisco%ziplink.net Exp $
  */
 
 /**
  * A Named Map for MITREObjects
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 1999-11-15 07:12:41 $
+ * @version $Revision: 1.3 $ $Date: 2000-02-22 11:10:00 $
 **/
 
-#ifndef MITREXSL_NAMEDMAP_H
-#define MITREXSL_NAMEDMAP_H
+#ifndef TRANSFRMX_NAMEDMAP_H
+#define TRANSFRMX_NAMEDMAP_H
 
 #include "String.h"
 #include "baseutils.h"
diff --git a/mozilla/extensions/transformiix/source/base/StringList.h b/mozilla/extensions/transformiix/source/base/StringList.h
index 56c1721cc94..6824ad8ea24 100644
--- a/mozilla/extensions/transformiix/source/base/StringList.h
+++ b/mozilla/extensions/transformiix/source/base/StringList.h
@@ -23,20 +23,20 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: StringList.h,v 1.4 2000-02-17 20:56:20 kvisco%ziplink.net Exp $
+ * $Id: StringList.h,v 1.5 2000-02-22 11:10:01 kvisco%ziplink.net Exp $
  */
 
 /**
  * A class for keeping an ordered list of Strings
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.4 $ $Date: 2000-02-17 20:56:20 $
+ * @version $Revision: 1.5 $ $Date: 2000-02-22 11:10:01 $
 **/
 
 #include "String.h"
 #include "baseutils.h"
 
-#ifndef MITREXSL_STRINGLIST_H
-#define MITREXSL_STRINGLIST_H
+#ifndef TRANSFRMX_STRINGLIST_H
+#define TRANSFRMX_STRINGLIST_H
 
 class StringList {
    friend class StringListIterator;
@@ -51,7 +51,7 @@ class StringList {
       /**
        * StringList destructor
       **/
-      ~StringList();
+      virtual ~StringList();
 
        MBool contains(String& search);
 
@@ -112,7 +112,7 @@ public:
 
 
    StringListIterator(StringList* list);
-   ~StringListIterator();
+   virtual ~StringListIterator();
 
    void    add(String* strptr);