diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7c8a20f25f0..bd58c7e34a9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,14 @@
-2002-02-11   Benjamin Kosnik  <bkoz@redhat.com>
+2002-02-13  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* src/localename.cc: Remove stdexcept include.
+	* src/locale-inst.cc: Same.
+	* src/locale.cc: Same.
+	* src/functexcept.cc: Remove string includes.
+	* include/std/std_bitset.h: Remove stdexcept include.
+	* testsuite/23_containers/bitset_members.cc: Add stdexcept.
+	* testsuite/23_containers/bitset_ctor.cc: Same.
+
+2002-02-11  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/stl_algo (__stl_threshold): Declare external.	
 	(__stl_chunk_size): Same.
diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index 6abd106213f..a6134398130 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -64,7 +64,6 @@
 #include <cstddef>     // for size_t
 #include <cstring>     // for memset
 #include <string>
-#include <stdexcept>
 #include <bits/functexcept.h>   // for invalid_argument, out_of_range, 
 			         // overflow_error
 #include <ostream>     // for ostream (operator<<)
diff --git a/libstdc++-v3/src/functexcept.cc b/libstdc++-v3/src/functexcept.cc
index 9798e8f2ca0..dab6f2f3199 100644
--- a/libstdc++-v3/src/functexcept.cc
+++ b/libstdc++-v3/src/functexcept.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -28,11 +28,10 @@
 #include <bits/functexcept.h>
 #include <cstdlib>
 #include <exception>
+#include <stdexcept>
 #include <new>
 #include <typeinfo>
-#include <stdexcept>
 #include <ios>
-#include <string>
 
 namespace std 
 {
diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index ff0dfd533f2..598c3c3869d 100644
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -37,7 +37,6 @@
 #include <cassert>
 #include <limits>
 #include <exception>
-#include <stdexcept>
 #include <locale>
 #include <istream>
 #include <ostream>
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 52091827259..0cea95b386a 100644
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -1,4 +1,5 @@
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,7 +32,6 @@
 #include <cctype>
 #include <limits>
 #include <exception>
-#include <stdexcept>
 #include <locale>
 #include <istream>
 #include <ostream>
diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc
index 816f7581c12..ad816486705 100644
--- a/libstdc++-v3/src/localename.cc
+++ b/libstdc++-v3/src/localename.cc
@@ -1,4 +1,5 @@
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -29,7 +30,6 @@
 #include <cstring>
 #include <locale>
 #include <vector>
-#include <stdexcept>
 
 namespace std
 {
diff --git a/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc b/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
index 8f9008ff058..c568e22af56 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset_ctor.cc
@@ -1,6 +1,6 @@
 // 1999-06-08 bkoz
 
-// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -22,6 +22,7 @@
 
 #include <string>
 #include <bitset>
+#include <stdexcept>
 #include <testsuite_hooks.h>
 
 bool test01(void)
diff --git a/libstdc++-v3/testsuite/23_containers/bitset_members.cc b/libstdc++-v3/testsuite/23_containers/bitset_members.cc
index f9a9726c198..a87b88db649 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset_members.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset_members.cc
@@ -1,6 +1,6 @@
 // 2001-06-03 pme
 
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +21,7 @@
 // 23.3.5.2 bitset members
 
 #include <bitset>
+#include <stdexcept>
 #include <testsuite_hooks.h>
 
 void