diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9ff75067f6ef7e3649f95de27e852d0590d2bf0c..a50dd9e64ef778b09548d49002ebe4d2bf13cfcc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,32 @@
+2003-01-04  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc:
+	Remove redundant #includes.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc:
+	Likewise.
+
 2004-01-04  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/12226
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
index ef4e6ada684b36a4b461057442086dad1b844650..99da679179903505f68239b2f325d833749bf56a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
@@ -22,7 +22,6 @@
 
 #include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
index 7a5e44502618c39b50396bd1c18231ede5f5c262..45ec098b3b9264d29b84e0398bf3bc0a892d233a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
index 9b467d3748783b878154b6f7cc43446943f8084e..9135c226999a02c9e3897bfffab5272e5e48c773 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
index 5c615aaebb686fcb77c8e40a2d6f088b56828334..efc2229d9ba3a8b0cfad8babff6ae0c88c964de3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
index 5efff5744a6745a2a566f57172f1d77c7adc24d0..832d96a5f8bbed4b8363e2fb9746e17fc515ef28 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
index 276fd913dfc6c10ca67ece126a138274de48fe57..098882c2395cd0c80910bd94e7518dc465abea21 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
index 23e68a7629b84366441a5e572aa56ac70b8d0d40..fefb43fffd7d371c03095dc4a3f4d1327c09a53c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
@@ -45,19 +43,19 @@ std::stringstream ss_01(str_01);
  
 bool test09()
 {
-   bool test __attribute__((unused)) = true;
+  bool test __attribute__((unused)) = true;
 
-   std::string st("2.456e3-+0.567e-2");
-   std::stringbuf sb(st);
-   std::istream is(&sb);
-   double f1 = 0, f2 = 0;
-   char c;
-   (is>>std::ws) >> f1;
-   (is>>std::ws) >> c;
-   (is>>std::ws) >> f2;
-   test = f1 == 2456;
-   VERIFY( f2 == 0.00567 );
-   VERIFY( c == '-' );
+  std::string st("2.456e3-+0.567e-2");
+  std::stringbuf sb(st);
+  std::istream is(&sb);
+  double f1 = 0, f2 = 0;
+  char c;
+  (is>>std::ws) >> f1;
+  (is>>std::ws) >> c;
+  (is>>std::ws) >> f2;
+  test = f1 == 2456;
+  VERIFY( f2 == 0.00567 );
+  VERIFY( c == '-' );
   return test;
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
index 08c39ee8167ca7f939ee7e8d1444c0a84ca54b2b..2c88f3e9ea94d5715802082a55015794a8f618e1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
index fc7d25e6ae27b4a889fb007561d93c8b06aa22a7..429b01b3c96dc346e46cec71c71bfabd91b5ddbb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
index 22896df79f376d4b8e93d30a21a9e1ab11d8bb24..70feaaebf8d5139253a168f1cda48633a26835e2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
@@ -20,9 +20,7 @@
 
 // 27.6.1.2.2 arithmetic extractors
 
-#include <cstdio> // for printf
 #include <istream>
-#include <ostream>
 #include <sstream>
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
index 8b8da8a1e80af6a3300bb8fe2f93e87fef0535a9..cfb2f7be7cf1f377435ee1ca76efb85c7862cdd4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
@@ -19,9 +19,6 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cstdio> // for sprintf
-#include <cmath> // for abs
-#include <cfloat> // for DBL_EPSILON
 #include <iostream>
 #include <iomanip>
 #include <sstream>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
index c1d41ca35acc60aaf4af2c2dc3f449dc3af51862..0aa130af27e01c0d122a982c827ae61b65452f8b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
@@ -19,7 +19,6 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cstdio> // for sprintf
 #include <iostream>
 #include <iomanip>
 #include <locale>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
index 0f8848b4008994ae9d7f0468106891c45783358d..c0acd07ba3ee34483b206c15e0ba2c99a44d54ec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
@@ -19,9 +19,6 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cstdio> // for sprintf
-#include <cmath> // for abs
-#include <cfloat> // for DBL_EPSILON
 #include <iostream>
 #include <iomanip>
 #include <sstream>