diff --git a/LineInfo.h b/LineInfo.h
index 31d713602..a096f52a4 100644
--- a/LineInfo.h
+++ b/LineInfo.h
@@ -19,11 +19,13 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: LineInfo.h,v 1.7 2003/01/17 05:49:03 steve Exp $"
+#ident "$Id: LineInfo.h,v 1.7.2.1 2005/06/14 15:33:54 steve Exp $"
 #endif
 
 # include  <string>
 
+using namespace std;
+
 /*
  * This class holds line information for an internal object.
  *
@@ -52,6 +54,9 @@ class LineInfo {
 
 /*
  * $Log: LineInfo.h,v $
+ * Revision 1.7.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
  * Revision 1.7  2003/01/17 05:49:03  steve
  *  Use stringstream in place of sprintf.
  *
diff --git a/StringHeap.h b/StringHeap.h
index 7602802b5..920815d02 100644
--- a/StringHeap.h
+++ b/StringHeap.h
@@ -19,12 +19,14 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: StringHeap.h,v 1.5 2004/02/18 17:11:54 steve Exp $"
+#ident "$Id: StringHeap.h,v 1.5.2.1 2005/06/14 15:33:54 steve Exp $"
 #endif
 
 # include  "config.h"
 # include  <string>
 
+using namespace std;
+
 class perm_string {
 
     public:
@@ -120,6 +122,9 @@ class StringHeapLex  : private StringHeap {
 
 /*
  * $Log: StringHeap.h,v $
+ * Revision 1.5.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
  * Revision 1.5  2004/02/18 17:11:54  steve
  *  Use perm_strings for named langiage items.
  *
diff --git a/svector.h b/svector.h
index a4f1b8742..c0bf61195 100644
--- a/svector.h
+++ b/svector.h
@@ -21,7 +21,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: svector.h,v 1.9 2003/07/23 02:35:44 steve Exp $"
+#ident "$Id: svector.h,v 1.9.2.1 2005/06/14 15:33:54 steve Exp $"
 #endif
 
 # include  "config.h"
@@ -101,14 +101,17 @@ template <class TYPE> class svector {
  * Override the implementation of the above template for the string
  * type parameter. The initialization to nil works different here.
  */
-inline svector<string>::svector<string>(unsigned size)
-: nitems_(size), items_(new string[size])
+template <> inline svector<std::string>::svector(unsigned size)
+: nitems_(size), items_(new std::string[size])
 {
 }
 
 
 /*
  * $Log: svector.h,v $
+ * Revision 1.9.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
  * Revision 1.9  2003/07/23 02:35:44  steve
  *  Inline the svector<string> constructor.
  *
diff --git a/verinum.h b/verinum.h
index 85c9578f0..201b2e73c 100644
--- a/verinum.h
+++ b/verinum.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: verinum.h,v 1.26 2004/02/17 06:52:55 steve Exp $"
+#ident "$Id: verinum.h,v 1.26.2.1 2005/06/14 15:33:54 steve Exp $"
 #endif
 
 # include  <string>
@@ -31,6 +31,8 @@
 class ostream;
 #endif
 
+using namespace std;
+
 /*
  * Numbers in Verilog are multibit strings, where each bit has 4
  * possible values: 0, 1, x or z. The verinum number is store in
@@ -147,6 +149,9 @@ extern verinum v_not(const verinum&left);
 
 /*
  * $Log: verinum.h,v $
+ * Revision 1.26.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
  * Revision 1.26  2004/02/17 06:52:55  steve
  *  Support unsigned divide of huge numbers.
  *
diff --git a/verireal.h b/verireal.h
index 199fc5f83..152e0b08c 100644
--- a/verireal.h
+++ b/verireal.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: verireal.h,v 1.10 2004/06/04 23:33:51 steve Exp $"
+#ident "$Id: verireal.h,v 1.10.2.1 2005/06/14 15:33:54 steve Exp $"
 #endif
 
 #ifdef HAVE_IOSFWD
@@ -28,6 +28,8 @@
 class ostream;
 #endif
 
+using namespace std;
+
 class verinum;
 
 /*
@@ -78,6 +80,9 @@ extern verireal operator- (const verireal&);
 
 /*
  * $Log: verireal.h,v $
+ * Revision 1.10.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
  * Revision 1.10  2004/06/04 23:33:51  steve
  *  Add unary minus as operator supported by verireal.
  *