more changes to header include path