Fix #5199-related include ordering