include dir fixes