Merged some of the header checks to reduce the size of the generated
configure script a bit.

6 files changed