diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dfce0332a952..758d0481de4c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-05  Paolo Carlini  <pcarlini@unitus.it>
+
+	* include/std/std_bitset.h: Fully qualify standard
+	functions with std::, thus avoiding Koenig lookup.
+
+	* include/std/std_fstream.h: Change comment to doxygen style.
+
 2003-07-05  Phil Edwards  <pme@gcc.gnu.org>
 
 	* include/std/std_limits.h:  More CPP->CXX changes.
diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index f3abc8e3ad82..66ba29540204 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -228,7 +228,7 @@ namespace std
 	      _M_w[__wshift] = _M_w[0] << __offset;
 	    }
 
-	  fill(_M_w + 0, _M_w + __wshift, static_cast<_WordT>(0));
+	  std::fill(_M_w + 0, _M_w + __wshift, static_cast<_WordT>(0));
 	}
     }
 
@@ -253,8 +253,8 @@ namespace std
 		  (_M_w[__n + __wshift + 1] << __sub_offset);
 	      _M_w[__limit] = _M_w[_Nw-1] >> __offset;
 	    }
-
-	  fill(_M_w + __limit + 1, _M_w + _Nw, static_cast<_WordT>(0));
+	  
+	  std::fill(_M_w + __limit + 1, _M_w + _Nw, static_cast<_WordT>(0));
 	}
     }
 
diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h
index 2b2a88deebaa..0e9f99ce80c6 100644
--- a/libstdc++-v3/include/std/std_fstream.h
+++ b/libstdc++-v3/include/std/std_fstream.h
@@ -145,11 +145,15 @@ namespace std
       */
       bool			_M_buf_allocated;
 
-      // _M_reading == false && _M_writing == false for 'uncommitted' mode;  
-      // _M_reading == true for 'read' mode;
-      // _M_writing == true for 'write' mode;
-      //
-      // NB: _M_reading == true && _M_writing == true is unused.
+      /**
+       *  @if maint
+       *  _M_reading == false && _M_writing == false for 'uncommitted' mode;  
+       *  _M_reading == true for 'read' mode;
+       *  _M_writing == true for 'write' mode;
+       *
+       *  NB: _M_reading == true && _M_writing == true is unused.
+       *  @endif
+      */ 
       bool                      _M_reading;
       bool                      _M_writing;