Move header inclusion in the right place