code cleanup for direct header dependencies

Merged username-removed-233259 requested to merge 22-dyfet into master

Closes #22 (closed)