Rearrange headers to prevent a F18 warning. #3918