Shuffle around some includes.