XXX This patch probably isn't right, but I'm not interested in detangling the GNU include file nightmare right now.