Merge pull request #25 from krinkinmu/header-deps-wip