Code

Merge branch 'fk/make-auto-header-dependencies'