diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e2f075a9f87d..69cf154723bd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-11  Paolo Carlini  <pcarlini@suse.de>
+
+	* config/locale/gnu/c_locale.h: Do not include <langinfo.h>
+	and <iconv.h>.
+	* config/locale/gnu/c++locale_internal.h: Include <langinfo.h>.
+
 2007-04-11  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/std/istream (class basic_istream<>): Remove unneded friend
@@ -19,7 +25,7 @@
 	* testsuite/22_locale/num_put/put/char/1.cc: Tweak comment.
 	* testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise.
 
-2007-04-11  Zack Weinberg  <zack@mrtock.ucsd.edu>
+2007-04-11  Zack Weinberg  <zackw@panix.com>
 
 	* include/std/iosfwd: Do not include <bits/c++locale.h> and
 	<bits/functexcept.h>.
diff --git a/libstdc++-v3/config/locale/gnu/c++locale_internal.h b/libstdc++-v3/config/locale/gnu/c++locale_internal.h
index 6f9b53510335..cbce1690f46c 100644
--- a/libstdc++-v3/config/locale/gnu/c++locale_internal.h
+++ b/libstdc++-v3/config/locale/gnu/c++locale_internal.h
@@ -38,6 +38,7 @@
 #include <bits/c++config.h>
 #include <clocale>
 #include <cstdlib>
+#include <langinfo.h>
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
                                                   
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h
index bc9db3a44b29..7a71b013eeee 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
@@ -1,6 +1,6 @@
 // Wrapper for underlying C-language localization -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -47,8 +47,6 @@
 #include <cstring>              // get std::strlen
 #include <cstdio>               // get std::vsnprintf or std::vsprintf
 #include <clocale>
-#include <langinfo.h>		// For codecvt
-#include <iconv.h>		// For codecvt using iconv, iconv_t
 #include <libintl.h> 		// For messages
 #include <cstdarg>