Merge "Remove an unsed include dir"