Fix some include ordering