adjust api and bump version to use it
resolve includes in final style