diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f2e56c57a7899bbeb98b92864d3ecaa5b1a4a97..5f720d819bc95c798101633f75f1bdb4d62e6b82 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* testsuite/17_intro/headers/all.cc,
+	testsuite/17_intro/headers/all_c++200x_compatibility.cc,
+	testsuite/17_intro/headers/all_pedantic_errors.cc,
+	testsuite/ext/headers.cc: Only include
+	<ext/codecvt_specializations.h> and <ext/enc_filebuf.h> if
+	_GLIBCXX_HAVE_ICONV.
+
 2008-06-05  Johannes Singler  <singler@ira.uka.de>
 
         * include/parallel/random_shuffle.h:
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all.cc b/libstdc++-v3/testsuite/17_intro/headers/all.cc
index 662bad6b10f89d45a5183ea41bfd7793a2ef9a11..706e4cf0266d149d3cf4a3d53e41d7656969ec36 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all.cc
@@ -112,10 +112,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc b/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
index 9410805a0857bb3ab2b7fba082aa3350f92d1f5d..9ba46cf976cc8b42980c7a8a8016f61fedeb5b78 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
@@ -113,10 +113,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc b/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
index 2b72a3928a52eee84a2b8cb26b89fbb32cb51156..955afef651512393305c72ea5d48b58ab8cd7ca5 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
@@ -113,10 +113,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/ext/headers.cc b/libstdc++-v3/testsuite/ext/headers.cc
index a1bdbb350f5b3b851cb6445269eb431a1ac774b2..d4c079eb525541d920be115b757e06998c7c4d22 100644
--- a/libstdc++-v3/testsuite/ext/headers.cc
+++ b/libstdc++-v3/testsuite/ext/headers.cc
@@ -28,10 +28,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>