fix some include dir problems