Cherrypick five upstream commits to fix "unused typedef" warnings when
building with recent clang. Four of these were included in the 1.56
release, the fourth was included in 1.59. One of these needed the
addition of "|| defined(clang)" because the GNUC_MINOR check
excluded clang.