Fix more header sorting issues in Core/ (now check-includes clean).