Merge "Improve <sys/cdefs.h>."