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