fix header dependencies
merge changes from master