Log Message:
Patches added recently for Solaris don't work on Linux, because they
include headers which are unavailable on Linux.  Modify the patches so
that those headers are included only when they are found by configure.