Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."