adapt includes, otherwise too many things to add to dependencies