Index: include/bits/ios_base.h
===================================================================
*** include/bits/ios_base.h	(revision 138861)
--- include/bits/ios_base.h	(working copy)
*************** _GLIBCXX_BEGIN_NAMESPACE(std)
*** 976,980 ****
--- 976,983 ----
  
  _GLIBCXX_END_NAMESPACE
  
+ #undef _IOS_BASE_SEEK_CUR
+ #undef _IOS_BASE_SEEK_END
+ 
  #endif /* _IOS_BASE_H */
  
Index: include/bits/char_traits.h
===================================================================
*** include/bits/char_traits.h	(revision 138861)
--- include/bits/char_traits.h	(working copy)
*************** _GLIBCXX_BEGIN_NAMESPACE(std)
*** 374,377 ****
--- 374,379 ----
  
  _GLIBCXX_END_NAMESPACE
  
+ #undef _CHAR_TRAITS_EOF
+ 
  #endif