Fix header include directory ordering