diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8acde4bf563..1c50b971989 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,13 @@
+2008-08-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/ios_base.h: Undef _IOS_BASE_SEEK_CUR and
+	_IOS_BASE_SEEK_END at the end of the file.
+	* include/bits/char_traits.h: Likewise for _CHAR_TRAITS_EOF.
+
 2008-08-07  Stephen M. Webb  <stephenw@xandros.com>
 
-	* include/tr1_impl/regex (match_results): Add cbegin()/cend() per N2691 WD.
+	* include/tr1_impl/regex (match_results<>::cbegin, cend): Add, per
+	N2691 WD.
 
 2008-08-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 85e4167758e..52158efff33 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -374,4 +374,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
 _GLIBCXX_END_NAMESPACE
 
+#undef _CHAR_TRAITS_EOF
+
 #endif
diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index 8b55028c537..6e2cef6a342 100644
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -976,5 +976,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
 _GLIBCXX_END_NAMESPACE
 
+#undef _IOS_BASE_SEEK_CUR
+#undef _IOS_BASE_SEEK_END
+
 #endif /* _IOS_BASE_H */