Fixed header include ordering