diff --git a/checkin_notes b/checkin_notes
index 1210019a5f..4c01a3b8dc 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10390,3 +10390,10 @@ Rom    Mar 6 2004
 
     client/
         cs_scheduler.c
+
+Rom    Mar 6 2004
+    - Changed the namespace references back to the orginal references so that the clients
+        will build on Solaris and Linux.
+
+    lib/
+        util.c, .h
diff --git a/lib/util.C b/lib/util.C
index 5615eb39c4..752a8f1843 100755
--- a/lib/util.C
+++ b/lib/util.C
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 #endif
 
+#ifndef _WIN32
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
@@ -36,7 +37,9 @@
 #endif
 #include <algorithm>
 #include <fstream>
-using namespace std;
+using std::ifstream;
+using std::min;
+#endif
 
 #include "error_numbers.h"
 #include "util.h"