Shuffle header order to make Mac compilation happier